author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
116,623 | 26.01.2019 16:24:17 | -19,080 | e351df7996a02c5385cad75a8d728c2d94bfe8ee | Added method to check whether InApp is HTML, handled TabLayout.OnTabSelectedListener version issues and added fix for issue | [
{
"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": "@@ -137,15 +137,6 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\ninitFullScreenDialog();\nprepareMedia();\nplayMedia();\n- fullScreenIcon.setOnClickListener(new View.OnClickListener() {\n- @Override\n- public void onClick(View v) {\n- if (!exoPlayerFullscreen)\n- openFullscreenDialog();\n- else\n- closeFullscreenDialog();\n- }\n- });\n}\nelse if (inAppNotification.mediaIsAudio()) {\nprepareMedia();\n@@ -212,6 +203,15 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nplayerView = new PlayerView(getActivity().getBaseContext());\nfullScreenIcon = new ImageView(getActivity().getBaseContext());\nfullScreenIcon.setImageDrawable(getActivity().getBaseContext().getResources().getDrawable(R.drawable.ic_fullscreen_expand));\n+ fullScreenIcon.setOnClickListener(new View.OnClickListener() {\n+ @Override\n+ public void onClick(View v) {\n+ if (!exoPlayerFullscreen)\n+ openFullscreenDialog();\n+ else\n+ closeFullscreenDialog();\n+ }\n+ });\nif(inAppNotification.isTablet() && isTablet()) {\nint playerWidth = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 408, getResources().getDisplayMetrics());\n@@ -297,6 +297,9 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nif(gifImageView != null) {\ngifImageView.clear();\n}\n+ if(exoPlayerFullscreen){\n+ closeFullscreenDialog();\n+ }\nif (player != null) {\nmediaPosition = player.getCurrentPosition();\nplayer.stop();\n"
},
{
"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": "@@ -525,6 +525,10 @@ class CTInAppNotification implements Parcelable {\nreturn contentType != null && this.mediaUrl != null && contentType.startsWith(\"audio\");\n}\n+ boolean isInAppHTML(){\n+ return this.getInAppType().equals(CTInAppType.CTInAppTypeInterstitialHTML) || this.getInAppType().equals(CTInAppType.CTInAppTypeHalfInterstitialHTML) || this.getInAppType().equals(CTInAppType.CTInAppTypeCoverHTML);\n+ }\n+\nprivate CTInAppNotification(Parcel in) {\ntry {\nid = in.readString();\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": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk;\nimport android.os.Parcel;\nimport android.os.Parcelable;\n+import android.support.design.widget.TabLayout;\nimport java.util.ArrayList;\nimport java.util.Arrays;\n@@ -42,8 +43,10 @@ public class CTInboxStyleConfig implements Parcelable {\nthis.unselectedTabColor = \"#808080\";\nthis.selectedTabIndicatorColor = \"#1C84FE\";\nthis.tabBackgroundColor = \"#FFFFFF\";\n+ if(baseOnTabSelectedListenerIsPresent()) {\nthis.tabs = new String[0];\n}\n+ }\nCTInboxStyleConfig(CTInboxStyleConfig config){\nthis.navBarColor = config.navBarColor;\n@@ -55,8 +58,10 @@ public class CTInboxStyleConfig implements Parcelable {\nthis.unselectedTabColor = config.unselectedTabColor;\nthis.selectedTabIndicatorColor = config.selectedTabIndicatorColor;\nthis.tabBackgroundColor = config.tabBackgroundColor;\n+ if(baseOnTabSelectedListenerIsPresent()) {\nthis.tabs = (config.tabs == null) ? new String[0] : Arrays.copyOf(config.tabs, config.tabs.length);\n}\n+ }\nprotected CTInboxStyleConfig(Parcel in) {\ntitleColor = in.readString();\n@@ -201,6 +206,7 @@ public class CTInboxStyleConfig implements Parcelable {\npublic void setTabs(ArrayList<String>tabs) {\nif (tabs == null || tabs.size() <= 0) return;\n+ if(baseOnTabSelectedListenerIsPresent()) {\nArrayList<String> toAdd;\nif (tabs.size() > MAX_TABS) {\ntoAdd = new ArrayList<>(tabs.subList(0, MAX_TABS));\n@@ -209,6 +215,7 @@ public class CTInboxStyleConfig implements Parcelable {\n}\nthis.tabs = toAdd.toArray(new String[0]);\n}\n+ }\npublic ArrayList<String> getTabs() {\nreturn this.tabs == null ? new ArrayList<String>() : new ArrayList<>(Arrays.asList(this.tabs));\n@@ -277,4 +284,48 @@ public class CTInboxStyleConfig implements Parcelable {\npublic void setTabBackgroundColor(String tabBackgroundColor) {\nthis.tabBackgroundColor = tabBackgroundColor;\n}\n+\n+ /**\n+ * CleverTap Android SDK targets to Android 28 (Pie), hence the support libraries like\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+ * @return boolean value to convey whether TabLayout.BaseOnTabSelectedListener is present or not\n+ * true if TabLayout.BaseOnTabSelectedListener is present\n+ * false if TabLayout.BaseOnTabSelectedListener is not present\n+ */\n+ private boolean baseOnTabSelectedListenerIsPresent() {\n+\n+ TabLayout.OnTabSelectedListener test = new TabLayout.OnTabSelectedListener() {\n+ @Override\n+ public void onTabSelected(TabLayout.Tab tab) {\n+\n+ }\n+\n+ @Override\n+ public void onTabUnselected(TabLayout.Tab tab) {\n+\n+ }\n+\n+ @Override\n+ public void onTabReselected(TabLayout.Tab tab) {\n+\n+ }\n+ };\n+ try {\n+ if (test instanceof TabLayout.BaseOnTabSelectedListener) {\n+ return true;\n+ } else {\n+ return false;\n+ }\n+ }catch (NoClassDefFoundError e){\n+ Logger.d(\"BaseOnTabSelectedListener not found! Please upgrade com.android.support:design library to v28.0.0 or above for Tabs to work properly. Dropping given tabs to avoid app crash\");\n+ return false;\n+ }\n+\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -64,15 +64,14 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\ntry {\n- if(!inAppNotification.getInAppType().toString().contains(\"Html\"))\n- {\n+ if(!inAppNotification.isInAppHTML()){\nsetRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);\n}\n} catch (Throwable t) {\nLogger.d(\"Error displaying InAppNotification\", t);\nint orientation = this.getResources().getConfiguration().orientation;\nif (orientation == Configuration.ORIENTATION_LANDSCAPE) {\n- if(inAppNotification.getInAppType().toString().contains(\"Html\")) {\n+ if(inAppNotification.isInAppHTML()) {\nLogger.d(\"App in Landscape, allowing HTML InApp Notifications\");\n}\nelse {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Added method to check whether InApp is HTML, handled TabLayout.OnTabSelectedListener version issues and added fix for #16 issue |
116,614 | 26.01.2019 18:27:56 | 28,800 | 3719592a2c088546cc31ea1bc93f11baffeab388 | refactor tabs and html inapp display check, other inbox config clean up | [
{
"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": "@@ -206,11 +206,12 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nfullScreenIcon.setOnClickListener(new View.OnClickListener() {\n@Override\npublic void onClick(View v) {\n- if (!exoPlayerFullscreen)\n+ if (!exoPlayerFullscreen) {\nopenFullscreenDialog();\n- else\n+ } else {\ncloseFullscreenDialog();\n}\n+ }\n});\nif(inAppNotification.isTablet() && isTablet()) {\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": "@@ -16,15 +16,38 @@ public class CTInboxStyleConfig implements Parcelable {\nprivate final static int MAX_TABS = 2;\n- private String titleColor;\n- private String bodyColor;\n- private String ctaColor;\n- private String layoutColor;\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;\nprivate String inboxBackgroundColor;\n- private boolean usingTabs;\nprivate String backButtonColor;\nprivate String selectedTabColor;\nprivate String unselectedTabColor;\n@@ -43,10 +66,8 @@ public class CTInboxStyleConfig implements Parcelable {\nthis.unselectedTabColor = \"#808080\";\nthis.selectedTabIndicatorColor = \"#1C84FE\";\nthis.tabBackgroundColor = \"#FFFFFF\";\n- if(baseOnTabSelectedListenerIsPresent()) {\nthis.tabs = new String[0];\n}\n- }\nCTInboxStyleConfig(CTInboxStyleConfig config){\nthis.navBarColor = config.navBarColor;\n@@ -58,22 +79,15 @@ public class CTInboxStyleConfig implements Parcelable {\nthis.unselectedTabColor = config.unselectedTabColor;\nthis.selectedTabIndicatorColor = config.selectedTabIndicatorColor;\nthis.tabBackgroundColor = config.tabBackgroundColor;\n- if(baseOnTabSelectedListenerIsPresent()) {\nthis.tabs = (config.tabs == null) ? new String[0] : Arrays.copyOf(config.tabs, config.tabs.length);\n}\n- }\nprotected CTInboxStyleConfig(Parcel in) {\n- titleColor = in.readString();\n- bodyColor = in.readString();\n- ctaColor = in.readString();\n- layoutColor = in.readString();\nnavBarColor = in.readString();\nnavBarTitle = in.readString();\nnavBarTitleColor = in.readString();\ninboxBackgroundColor = in.readString();\ntabs = in.createStringArray();\n- usingTabs = in.readByte() != 0x00;\nbackButtonColor = in.readString();\nselectedTabColor = in.readString();\nunselectedTabColor = in.readString();\n@@ -88,16 +102,11 @@ public class CTInboxStyleConfig implements Parcelable {\n@Override\npublic void writeToParcel(Parcel dest, int flags) {\n- dest.writeString(titleColor);\n- dest.writeString(bodyColor);\n- dest.writeString(ctaColor);\n- dest.writeString(layoutColor);\ndest.writeString(navBarColor);\ndest.writeString(navBarTitle);\ndest.writeString(navBarTitleColor);\ndest.writeString(inboxBackgroundColor);\ndest.writeStringArray(tabs);\n- dest.writeByte((byte) (usingTabs ? 0x01 : 0x00));\ndest.writeString(backButtonColor);\ndest.writeString(selectedTabColor);\ndest.writeString(unselectedTabColor);\n@@ -118,37 +127,6 @@ public class CTInboxStyleConfig implements Parcelable {\n}\n};\n- String getTitleColor() {\n- return titleColor;\n- }\n-\n- void setTitleColor(String titleColor) {\n- this.titleColor = titleColor;\n- }\n-\n- String getBodyColor() {\n- return bodyColor;\n- }\n-\n- void setBodyColor(String bodyColor) {\n- this.bodyColor = bodyColor;\n- }\n-\n- String getCtaColor() {\n- return ctaColor;\n- }\n-\n- void setCtaColor(String ctaColor) {\n- this.ctaColor = ctaColor;\n- }\n-\n- String getLayoutColor() {\n- return layoutColor;\n- }\n-\n- void setLayoutColor(String layoutColor) {\n- this.layoutColor = layoutColor;\n- }\npublic String getNavBarColor() {\nreturn navBarColor;\n@@ -206,7 +184,7 @@ public class CTInboxStyleConfig implements Parcelable {\npublic void setTabs(ArrayList<String>tabs) {\nif (tabs == null || tabs.size() <= 0) return;\n- if(baseOnTabSelectedListenerIsPresent()) {\n+ if (platformSupportsTabs) {\nArrayList<String> toAdd;\nif (tabs.size() > MAX_TABS) {\ntoAdd = new ArrayList<>(tabs.subList(0, MAX_TABS));\n@@ -214,6 +192,8 @@ 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}\n@@ -284,48 +264,4 @@ public class CTInboxStyleConfig implements Parcelable {\npublic void setTabBackgroundColor(String tabBackgroundColor) {\nthis.tabBackgroundColor = tabBackgroundColor;\n}\n-\n- /**\n- * CleverTap Android SDK targets to Android 28 (Pie), hence the support libraries like\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- * @return boolean value to convey whether TabLayout.BaseOnTabSelectedListener is present or not\n- * true if TabLayout.BaseOnTabSelectedListener is present\n- * false if TabLayout.BaseOnTabSelectedListener is not present\n- */\n- private boolean baseOnTabSelectedListenerIsPresent() {\n-\n- TabLayout.OnTabSelectedListener test = new TabLayout.OnTabSelectedListener() {\n- @Override\n- public void onTabSelected(TabLayout.Tab tab) {\n-\n- }\n-\n- @Override\n- public void onTabUnselected(TabLayout.Tab tab) {\n-\n- }\n-\n- @Override\n- public void onTabReselected(TabLayout.Tab tab) {\n-\n- }\n- };\n- try {\n- if (test instanceof TabLayout.BaseOnTabSelectedListener) {\n- return true;\n- } else {\n- return false;\n- }\n- }catch (NoClassDefFoundError e){\n- Logger.d(\"BaseOnTabSelectedListener not found! Please upgrade com.android.support:design library to v28.0.0 or above for Tabs to work properly. Dropping given tabs to avoid app crash\");\n- return false;\n- }\n-\n- }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -63,27 +63,25 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nreturn;\n}\n- try {\n+ // Allow rotation for HTML InApp Notifications\n+ // For native templates force portrait\n+ // If unable to force portrait: if app is currently in Portrait display; otherwise drop\nif (!inAppNotification.isInAppHTML()) {\n+ try {\nsetRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);\n- }\n} catch (Throwable t) {\nLogger.d(\"Error displaying InAppNotification\", t);\nint orientation = this.getResources().getConfiguration().orientation;\nif (orientation == Configuration.ORIENTATION_LANDSCAPE) {\n- if(inAppNotification.isInAppHTML()) {\n- Logger.d(\"App in Landscape, allowing HTML InApp Notifications\");\n- }\n- else {\nLogger.d(\"App in Landscape, dismissing portrait InApp Notification\");\nfinish();\ndidDismiss(null);\nreturn;\n- }\n} else {\nLogger.d(\"App in Portrait, displaying InApp Notification anyway\");\n}\n}\n+ }\nCTInAppBaseFullFragment contentFragment;\nif (savedInstanceState == null) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | refactor tabs and html inapp display check, other inbox config clean up |
116,614 | 26.01.2019 19:09:06 | 28,800 | 057d9405fa9acf667b180690c3c15dda8b4ca14f | fade out inapps to match fade in | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -272,8 +272,16 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\n}\n+ @Override\n+ public void finish() {\n+ super.finish();\n+ overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);\n+ }\n+\n@Override\npublic void onBackPressed() {\n+ super.onBackPressed();\n+ overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);\nfinish();\ndidDismiss(null);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fade out inapps to match fade in |
116,614 | 29.01.2019 20:18:05 | 28,800 | 51cf4be27c5944ca1d46db210da34c3b03b4186c | refactor media recycler view | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -4,7 +4,7 @@ buildscript {\njcenter()\n}\ndependencies {\n- classpath 'com.android.tools.build:gradle:3.2.1'\n+ classpath 'com.android.tools.build:gradle:3.3.0'\nclasspath 'com.github.dcendents:android-maven-gradle-plugin:2.1'\nclasspath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'\nclasspath 'com.google.gms:google-services:4.2.0'\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"diff": "@@ -65,6 +65,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n} else {\nthis.readDot.setVisibility(View.VISIBLE);\n}\n+ frameLayout.setVisibility(View.GONE);\n//Shows the CTA layout only if links are present, also handles the display of the CTAs depending on the number\nJSONArray iconlinksArray = content.getLinks();\nif (iconlinksArray != null) {\n@@ -131,9 +132,10 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.ctaLinearLayout.setVisibility(View.GONE);\n}\n- //removeVideoView();\nthis.mediaImage.setVisibility(View.GONE);\n+ this.mediaImage.setBackgroundColor(Color.TRANSPARENT);\nthis.squareImage.setVisibility(View.GONE);\n+ this.squareImage.setBackgroundColor(Color.TRANSPARENT);\ntry {\nswitch (inboxMessage.getOrientation()) {\ncase \"l\":\n@@ -170,6 +172,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}else if(content.mediaIsAudio()){\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ this.mediaImage.setBackgroundColor(Color.BLACK);\nint drawableId = getThumbnailImage(Constants.AUDIO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.mediaImage.getContext())\n@@ -195,13 +198,14 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n} else if (content.mediaIsVideo()) {\nif(!content.getPosterUrl().isEmpty()) {\nthis.squareImage.setVisibility(View.VISIBLE);\n- this.squareImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ this.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nGlide.with(this.squareImage.getContext())\n.load(content.getPosterUrl())\n.into(this.squareImage);\n}else{\nthis.squareImage.setVisibility(View.VISIBLE);\n- this.squareImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ this.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n+ this.squareImage.setBackgroundColor(Color.BLACK);\nint drawableId = getThumbnailImage(Constants.VIDEO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.squareImage.getContext())\n@@ -212,6 +216,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n} else if (content.mediaIsAudio()){\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n+ this.squareImage.setBackgroundColor(Color.BLACK);\nint drawableId = getThumbnailImage(Constants.AUDIO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.squareImage.getContext())\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": "package com.clevertap.android.sdk;\nimport android.annotation.SuppressLint;\n-import android.app.Activity;\nimport android.content.Context;\n+import android.content.res.Resources;\nimport android.graphics.Color;\n-import android.graphics.drawable.Drawable;\n-import android.media.MediaMetadataRetriever;\nimport android.net.Uri;\n-import android.os.Build;\nimport android.support.annotation.NonNull;\nimport android.support.v7.widget.RecyclerView;\n+import android.util.DisplayMetrics;\nimport android.util.TypedValue;\nimport android.view.Gravity;\nimport android.view.View;\n@@ -20,27 +18,12 @@ import android.widget.ImageView;\nimport android.widget.LinearLayout;\nimport android.widget.RelativeLayout;\n-import com.bumptech.glide.Glide;\n-import com.google.android.exoplayer2.ExoPlaybackException;\n-import com.google.android.exoplayer2.ExoPlayerFactory;\n-import com.google.android.exoplayer2.PlaybackParameters;\n-import com.google.android.exoplayer2.Player;\nimport com.google.android.exoplayer2.SimpleExoPlayer;\n-import com.google.android.exoplayer2.Timeline;\n-import com.google.android.exoplayer2.source.TrackGroupArray;\nimport com.google.android.exoplayer2.source.hls.HlsMediaSource;\n-import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;\n-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;\n-import com.google.android.exoplayer2.trackselection.TrackSelection;\n-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;\n-import com.google.android.exoplayer2.trackselection.TrackSelector;\n-import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;\nimport com.google.android.exoplayer2.ui.PlayerView;\n-import com.google.android.exoplayer2.upstream.BandwidthMeter;\nimport com.google.android.exoplayer2.upstream.DataSource;\nimport com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;\nimport com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;\n-import com.google.android.exoplayer2.upstream.TransferListener;\nimport com.google.android.exoplayer2.util.Util;\nimport java.lang.ref.WeakReference;\n@@ -48,8 +31,6 @@ import java.text.SimpleDateFormat;\nimport java.util.Date;\nclass CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\n-\n- private PlayerView videoSurfaceView;\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\nRelativeLayout relativeLayout,clickLayout,bodyRelativeLayout;\nLinearLayout ctaLinearLayout;\n@@ -57,10 +38,12 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nContext context;\nImageView mediaImage,squareImage;\n- private Player.EventListener playerListener;\n-\nprivate WeakReference<CTInboxListViewFragment> parentWeakReference;\n+ private CTInboxMessage message;\n+ private CTInboxMessageContent firstContentItem;\n+ private boolean requiresMediaPlayer;\n+\nCTInboxListViewFragment getParent() {\nreturn parentWeakReference.get();\n}\n@@ -72,6 +55,9 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nvoid configureWithMessage(final CTInboxMessage inboxMessage, final CTInboxListViewFragment parent, final int position) {\ncontext = parent.getContext();\nparentWeakReference = new WeakReference<>(parent);\n+ message = inboxMessage;\n+ firstContentItem = message.getInboxMessageContents().get(0);\n+ requiresMediaPlayer = firstContentItem.mediaIsAudio() || firstContentItem.mediaIsVideo();\n}\n/**\n@@ -91,7 +77,8 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\n}else if(diff > 24*60*60 && diff < 48*60*60){\nreturn \"Yesterday\";\n}else {\n- @SuppressLint(\"SimpleDateFormat\") SimpleDateFormat sdf = new SimpleDateFormat(\"dd MMM\");\n+ @SuppressLint(\"SimpleDateFormat\")\n+ SimpleDateFormat sdf = new SimpleDateFormat(\"dd MMM\");\nreturn sdf.format(new Date(time));\n}\n}\n@@ -117,33 +104,91 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\ntertiaryButton.setLayoutParams(tertiaryLayoutParams);\n}\n- private void cleanUpVideoView() {\n- if (videoSurfaceView != null) {\n- Player player = videoSurfaceView.getPlayer();\n- if (player != null) {\n- if (playerListener != null) {\n- player.removeListener(playerListener);\n- playerListener = null;\n- }\n- player.release();\n- videoSurfaceView.setPlayer(null);\n- }\n- ViewGroup parent = (ViewGroup) videoSurfaceView.getParent();\n- if (parent != null) {\n- int index = parent.indexOfChild(videoSurfaceView);\n- if (index >= 0) {\n- parent.removeViewAt(index);\n+ private FrameLayout getLayoutForMediaPlayer() {\n+ return frameLayout;\n}\n+\n+ boolean needsMediaPlayer () {\n+ return requiresMediaPlayer;\n}\n- videoSurfaceView = null;\n+\n+ // TODO What to do about rotation\n+\n+ boolean addMediaPlayer(PlayerView videoSurfaceView) {\n+ if (!requiresMediaPlayer) {\n+ return false;\n}\n+ FrameLayout frameLayout = getLayoutForMediaPlayer();\n+ if (frameLayout == null) {\n+ return false;\n}\n+ frameLayout.removeAllViews();\n- void removeVideoView() {\n- frameLayout.setVisibility(View.GONE);\n- cleanUpVideoView();\n- }\n+ final Resources resources = context.getResources();\n+ final DisplayMetrics displayMetrics = resources.getDisplayMetrics();\n+ int width = resources.getDisplayMetrics().widthPixels;\n+ int height = message.getOrientation().equalsIgnoreCase(\"l\") ? Math.round(width * 0.5625f) : width;\n+ videoSurfaceView.setLayoutParams(new FrameLayout.LayoutParams(width, height));\n+ frameLayout.addView(videoSurfaceView);\n+ int color = Color.BLACK;\n+ frameLayout.setBackgroundColor(color);\n+\n+ final SimpleExoPlayer player = (SimpleExoPlayer) videoSurfaceView.getPlayer();\n+ float currentVolume = player.getVolume();\n+ if (firstContentItem.mediaIsVideo()) {\n+ final ImageView muteIcon = new ImageView(context);\n+ if (currentVolume > 0) {\n+ muteIcon.setImageDrawable(context.getResources().getDrawable(R.drawable.volume_on));\n+ } else {\n+ muteIcon.setImageDrawable(context.getResources().getDrawable(R.drawable.volume_off));\n+ }\n+\n+ int iconWidth = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30, displayMetrics);\n+ int iconHeight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30, displayMetrics);\n+ FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(iconWidth, iconHeight);\n+ int iconTop = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 4, displayMetrics);\n+ int iconRight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 2, displayMetrics);\n+ layoutParams.setMargins(0, iconTop, iconRight, 0);\n+ layoutParams.gravity = Gravity.END;\n+ muteIcon.setLayoutParams(layoutParams);\n+ muteIcon.setOnClickListener(new View.OnClickListener() {\n+ @Override\n+ public void onClick(View v) {\n+ float currentVolume = player.getVolume();\n+ if (currentVolume > 0) {\n+ player.setVolume(0f);\n+ muteIcon.setImageDrawable(resources.getDrawable(R.drawable.volume_off));\n+ } else if (currentVolume == 0) {\n+ player.setVolume(1);\n+ muteIcon.setImageDrawable(resources.getDrawable(R.drawable.volume_on));\n+ }\n+ }\n+ });\n+ frameLayout.addView(muteIcon);\n+ }\n+ frameLayout.setVisibility(View.VISIBLE);\n+\n+ videoSurfaceView.requestFocus();\n+ videoSurfaceView.setShowBuffering(true);\n+ DefaultBandwidthMeter defaultBandwidthMeter = new DefaultBandwidthMeter();\n+ DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(context,\n+ Util.getUserAgent(context, context.getPackageName()), defaultBandwidthMeter);\n+ String uriString = firstContentItem.getMedia();\n+ if (uriString != null) {\n+ HlsMediaSource hlsMediaSource = new HlsMediaSource.Factory(dataSourceFactory).createMediaSource(Uri.parse(uriString));\n+ // Prepare the player with the source.\n+ player.prepare(hlsMediaSource);\n+ if(firstContentItem.mediaIsAudio()) {\n+ player.setPlayWhenReady(false);\n+ player.setVolume(1f);\n+ }else if(firstContentItem.mediaIsVideo()){\n+ player.setPlayWhenReady(true);\n+ player.setVolume(currentVolume);\n+ }\n+ }\n+ return true;\n+ }\nint getThumbnailImage(String image){\nif (context != null) {\nreturn context.getResources().getIdentifier(image,\"drawable\",context.getPackageName());\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": "@@ -119,7 +119,6 @@ public class CTInboxListViewFragment extends Fragment {\nif (haveVideoPlayerSupport) {\nmediaRecyclerView = new MediaPlayerRecyclerView(getActivity());\n- mediaRecyclerView.setVideoInfoList(inboxMessages);\nmediaRecyclerView.setVisibility(View.VISIBLE);\nmediaRecyclerView.setLayoutManager(linearLayoutManager);\nmediaRecyclerView.addItemDecoration(new VerticalSpaceItemDecoration(18));\n@@ -127,6 +126,8 @@ public class CTInboxListViewFragment extends Fragment {\nmediaRecyclerView.setAdapter(inboxMessageAdapter);\ninboxMessageAdapter.notifyDataSetChanged();\n+ linearLayout.addView(mediaRecyclerView);\n+\nif (firstTime && shouldAutoPlayOnFirstLaunch()) {\nnew Handler(Looper.getMainLooper()).postDelayed(new Runnable() {\n@Override\n@@ -136,7 +137,6 @@ public class CTInboxListViewFragment extends Fragment {\n}, 1000);\nfirstTime = false;\n}\n- linearLayout.addView(mediaRecyclerView);\n} else {\nRecyclerView recyclerView = allView.findViewById(R.id.list_view_recycler_view);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"diff": "@@ -66,6 +66,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}else{\nthis.readDot.setVisibility(View.VISIBLE);\n}\n+ frameLayout.setVisibility(View.GONE);\n//Shows the CTA layout only if links are present, also handles the display of the CTAs depending on the number\nJSONArray linksArray = content.getLinks();\nif(linksArray != null){\n@@ -131,10 +132,10 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}else{\nthis.ctaLinearLayout.setVisibility(View.GONE);\n}\n- //Loads the media based on orientation and media type\n- removeVideoView();\nthis.mediaImage.setVisibility(View.GONE);\n+ this.mediaImage.setBackgroundColor(Color.TRANSPARENT);\nthis.squareImage.setVisibility(View.GONE);\n+ this.squareImage.setBackgroundColor(Color.TRANSPARENT);\ntry {\nswitch (inboxMessage.getOrientation()) {\ncase \"l\":\n@@ -171,6 +172,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}else if(content.mediaIsAudio()){\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ this.mediaImage.setBackgroundColor(Color.BLACK);\nint drawableId = getThumbnailImage(Constants.AUDIO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.mediaImage.getContext())\n@@ -196,13 +198,14 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n} else if (content.mediaIsVideo()) {\nif(!content.getPosterUrl().isEmpty()) {\nthis.squareImage.setVisibility(View.VISIBLE);\n- this.squareImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ this.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nGlide.with(this.squareImage.getContext())\n.load(content.getPosterUrl())\n.into(this.squareImage);\n}else{\nthis.squareImage.setVisibility(View.VISIBLE);\n- this.squareImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ this.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n+ this.squareImage.setBackgroundColor(Color.BLACK);\nint drawableId = getThumbnailImage(Constants.VIDEO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.squareImage.getContext())\n@@ -213,6 +216,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}else if(content.mediaIsAudio()){\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n+ this.squareImage.setBackgroundColor(Color.BLACK);\nint drawableId = getThumbnailImage(Constants.AUDIO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.squareImage.getContext())\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": "@@ -4,21 +4,15 @@ import android.content.Context;\nimport android.graphics.Color;\nimport android.graphics.Point;\nimport android.graphics.drawable.Drawable;\n-import android.net.Uri;\n-import android.os.Build;\nimport android.support.annotation.NonNull;\nimport android.support.v7.widget.LinearLayoutManager;\nimport android.support.v7.widget.RecyclerView;\nimport android.util.AttributeSet;\n-import android.util.TypedValue;\nimport android.view.Display;\n-import android.view.Gravity;\nimport android.view.View;\nimport android.view.ViewGroup;\nimport android.view.WindowManager;\nimport android.widget.AbsListView;\n-import android.widget.FrameLayout;\n-import android.widget.ImageView;\nimport com.google.android.exoplayer2.ExoPlaybackException;\nimport com.google.android.exoplayer2.ExoPlayerFactory;\n@@ -27,7 +21,6 @@ import com.google.android.exoplayer2.Player;\nimport com.google.android.exoplayer2.SimpleExoPlayer;\nimport com.google.android.exoplayer2.Timeline;\nimport com.google.android.exoplayer2.source.TrackGroupArray;\n-import com.google.android.exoplayer2.source.hls.HlsMediaSource;\nimport com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;\nimport com.google.android.exoplayer2.trackselection.DefaultTrackSelector;\nimport com.google.android.exoplayer2.trackselection.TrackSelection;\n@@ -36,26 +29,17 @@ import com.google.android.exoplayer2.trackselection.TrackSelector;\nimport com.google.android.exoplayer2.ui.AspectRatioFrameLayout;\nimport com.google.android.exoplayer2.ui.PlayerView;\nimport com.google.android.exoplayer2.upstream.BandwidthMeter;\n-import com.google.android.exoplayer2.upstream.DataSource;\nimport com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;\n-import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;\n-import com.google.android.exoplayer2.util.Util;\n-\n-import java.util.ArrayList;\n-import java.util.List;\npublic class MediaPlayerRecyclerView extends RecyclerView {\n- private List<CTInboxMessage> videoInfoList = new ArrayList<>();\nprivate int videoSurfaceDefaultHeight = 0;\nprivate int screenDefaultHeight = 0;\nSimpleExoPlayer player;\n//surface view for playing video\nprivate PlayerView videoSurfaceView;\n- //private ImageView mCoverImage;\nprivate Context appContext;\nint targetPosition;\n- ImageView muteIcon;\n/**\n* the position of playing video\n@@ -101,23 +85,15 @@ public class MediaPlayerRecyclerView extends RecyclerView {\ninitialize(context);\n}\n- public void setVideoInfoList(List<CTInboxMessage> videoInfoList) {\n- this.videoInfoList = videoInfoList;\n-\n- }\n-\n-\n/**\n* prepare for video play\n*/\n//remove the player from the row\nprivate void removeVideoView(PlayerView videoView) {\n-\nViewGroup parent = (ViewGroup) videoView.getParent();\nif (parent == null) {\nreturn;\n}\n-\nint index = parent.indexOfChild(videoView);\nif (index >= 0) {\nparent.removeViewAt(index);\n@@ -125,28 +101,14 @@ public class MediaPlayerRecyclerView extends RecyclerView {\n}\n}\n- private void removeFrameLayout(FrameLayout frameLayout){\n- ViewGroup parent = (ViewGroup) frameLayout.getParent();\n- if (parent == null) {\n- return;\n- }\n-\n- int index = parent.indexOfChild(frameLayout);\n- if (index >= 0) {\n- parent.removeViewAt(index);\n- }\n- }\n-\n- //play the video in the row\npublic void playVideo() {\n-\n+ //noinspection ConstantConditions\nint startPosition = ((LinearLayoutManager) getLayoutManager()).findFirstVisibleItemPosition();\nint endPosition = ((LinearLayoutManager) getLayoutManager()).findLastVisibleItemPosition();\nif (endPosition - startPosition > 1) {\nendPosition = startPosition + 1;\n}\n-\nif (startPosition < 0 || endPosition < 0) {\nreturn;\n}\n@@ -159,6 +121,7 @@ public class MediaPlayerRecyclerView extends RecyclerView {\ntargetPosition = startPosition;\n}\n+ //noinspection ConstantConditions\nif (targetPosition < 0 || targetPosition == playPosition) {\nreturn;\n}\n@@ -169,7 +132,6 @@ public class MediaPlayerRecyclerView extends RecyclerView {\nremoveVideoView(videoSurfaceView);\n-\n// get target View targetPosition in RecyclerView\nint at = targetPosition - ((LinearLayoutManager) getLayoutManager()).findFirstVisibleItemPosition();\n@@ -178,116 +140,32 @@ public class MediaPlayerRecyclerView extends RecyclerView {\nreturn;\n}\n- RecyclerView.ViewHolder holder = null;\n-\n- switch (videoInfoList.get(targetPosition).getType()){\n- case IconMessage:\n- holder = (CTIconMessageViewHolder) child.getTag();\n- break;\n- case SimpleMessage:\n- holder = (CTSimpleMessageViewHolder) child.getTag();\n- break;\n- }\n+ CTInboxBaseMessageViewHolder holder = (CTInboxBaseMessageViewHolder) child.getTag();\nif (holder == null) {\nplayPosition = -1;\nreturn;\n}\n- FrameLayout frameLayout = null;\n- switch (videoInfoList.get(targetPosition).getType()){\n- case IconMessage:\n- frameLayout = holder.itemView.findViewById(R.id.icon_message_frame_layout);\n- break;\n- case SimpleMessage:\n- frameLayout = holder.itemView.findViewById(R.id.simple_message_frame_layout);\n- break;\n- }\n-\n- if (videoInfoList.get(targetPosition).getOrientation().equalsIgnoreCase(\"l\")) {\n- int width = getResources().getDisplayMetrics().widthPixels;// Get width of the screen\n- int height = Math.round(width * 0.5625f);\n- videoSurfaceView.setLayoutParams(new FrameLayout.LayoutParams(width, height));\n- } else if (videoInfoList.get(targetPosition).getOrientation().equalsIgnoreCase(\"p\")) {\n- int width = getResources().getDisplayMetrics().widthPixels;// Get width of the screen\n- videoSurfaceView.setLayoutParams(new FrameLayout.LayoutParams(width, width));\n- videoSurfaceView.setResizeMode(AspectRatioFrameLayout.RESIZE_MODE_FIT);\n+ if (!holder.needsMediaPlayer()) {\n+ return;\n}\n- if (frameLayout != null) {\n- if(videoInfoList.get(targetPosition).getInboxMessageContents().get(0).mediaIsVideo() || videoInfoList.get(targetPosition).getInboxMessageContents().get(0).mediaIsAudio()) {\n- frameLayout.addView(videoSurfaceView);\n- frameLayout.setVisibility(VISIBLE);\n- frameLayout.setBackgroundColor(Color.parseColor(videoInfoList.get(targetPosition).getBgColor()));\n- if(videoInfoList.get(targetPosition).getInboxMessageContents().get(0).mediaIsVideo()) {\n- muteIcon = new ImageView(appContext);\n- muteIcon.setImageDrawable(appContext.getResources().getDrawable(R.drawable.volume_off));//Volume off icon here by default\n- int iconWidth = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30, getResources().getDisplayMetrics());\n- int iconHeight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30, getResources().getDisplayMetrics());\n- FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(iconWidth, iconHeight);\n- int iconTop = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 4, getResources().getDisplayMetrics());\n- int iconRight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 2, getResources().getDisplayMetrics());\n- layoutParams.setMargins(0, iconTop, iconRight, 0);\n- layoutParams.gravity = Gravity.END;\n- muteIcon.setLayoutParams(layoutParams);\n- muteIcon.setOnClickListener(new View.OnClickListener() {\n- @Override\n- public void onClick(View v) {\n- float currentVolume = player.getVolume();\n- if (currentVolume > 0) {\n- player.setVolume(0f);\n- muteIcon.setImageDrawable(appContext.getResources().getDrawable(R.drawable.volume_off));//change to volume off icon\n- } else if (currentVolume == 0) {\n- player.setVolume(1);\n- muteIcon.setImageDrawable(appContext.getResources().getDrawable(R.drawable.volume_on));//change to volume on icon\n- }\n- }\n- });\n- frameLayout.addView(muteIcon);\n- }\n- }\n- }\n- addedVideo = true;\n+ addedVideo = holder.addMediaPlayer(videoSurfaceView);\n+ if (addedVideo) {\nrowParent = holder.itemView;\n- videoSurfaceView.requestFocus();\n- videoSurfaceView.setShowBuffering(true);\n- // Bind the player to the view.\n- videoSurfaceView.setPlayer(player);\n-\n- // Measures bandwidth during playback. Can be null if not required.\n- DefaultBandwidthMeter defaultBandwidthMeter = new DefaultBandwidthMeter();\n- // Produces DataSource instances through which media data is loaded.\n-\n- DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(appContext,\n- Util.getUserAgent(appContext, appContext.getPackageName()), defaultBandwidthMeter);\n- // This is the MediaSource representing the media to be played.\n- String uriString = videoInfoList.get(targetPosition).getInboxMessageContents().get(0).getMedia();\n- if (uriString != null) {\n- HlsMediaSource hlsMediaSource = new HlsMediaSource.Factory(dataSourceFactory).createMediaSource(Uri.parse(uriString));\n- // Prepare the player with the source.\n- player.prepare(hlsMediaSource);\n- if(videoInfoList.get(targetPosition).getInboxMessageContents().get(0).mediaIsAudio()) {\n- player.setPlayWhenReady(false);\n- player.setVolume(1f);\n- }else if(videoInfoList.get(targetPosition).getInboxMessageContents().get(0).mediaIsVideo()){\n- player.setPlayWhenReady(true);\n- player.setVolume(0f);\n}\n}\n- }\n-\nprivate int getVisibleVideoSurfaceHeight(int playPosition) {\n+ //noinspection ConstantConditions\nint at = playPosition - ((LinearLayoutManager) getLayoutManager()).findFirstVisibleItemPosition();\n-\nView child = getChildAt(at);\nif (child == null) {\nreturn 0;\n}\n-\nint[] location01 = new int[2];\nchild.getLocationInWindow(location01);\n-\nif (location01[1] < 0) {\nreturn location01[1] + videoSurfaceDefaultHeight;\n} else {\n@@ -295,18 +173,23 @@ public class MediaPlayerRecyclerView extends RecyclerView {\n}\n}\n-\nprivate void initialize(Context context) {\n-\nappContext = context.getApplicationContext();\n+ //noinspection ConstantConditions\nDisplay display = ((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();\nPoint point = new Point();\ndisplay.getSize(point);\n+ //noinspection SuspiciousNameCombination\nvideoSurfaceDefaultHeight = point.x;\nscreenDefaultHeight = point.y;\nvideoSurfaceView = new PlayerView(appContext);\n- videoSurfaceView.setResizeMode(AspectRatioFrameLayout.RESIZE_MODE_ZOOM);\n+ videoSurfaceView.setBackgroundColor(Color.TRANSPARENT);\n+ videoSurfaceView.setResizeMode(AspectRatioFrameLayout.RESIZE_MODE_FIT);\n+\n+ videoSurfaceView.setUseArtwork(true);\n+ Drawable artwork = context.getResources().getDrawable(R.drawable.ct_audio);\n+ videoSurfaceView.setDefaultArtwork(Utils.drawableToBitmap(artwork));\nBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter();\nTrackSelection.Factory videoTrackSelectionFactory =\n@@ -314,20 +197,10 @@ public class MediaPlayerRecyclerView extends RecyclerView {\nTrackSelector trackSelector =\nnew DefaultTrackSelector(videoTrackSelectionFactory);\n- // 2. Create the player\nplayer = ExoPlayerFactory.newSimpleInstance(appContext, trackSelector);\n- // Bind the player to the view.\nvideoSurfaceView.setUseController(true);\n- //videoSurfaceView.setShowBuffering(true);\n- videoSurfaceView.setUseArtwork(true);\nvideoSurfaceView.setControllerAutoShow(false);\nvideoSurfaceView.setPlayer(player);\n- Drawable artwork = context.getResources().getDrawable(R.drawable.ct_audio);\n- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {\n- videoSurfaceView.setDefaultArtwork(Utils.drawableToBitmap(artwork));\n- }else{\n- videoSurfaceView.setDefaultArtwork(Utils.drawableToBitmap(artwork));\n- }\naddOnScrollListener(new RecyclerView.OnScrollListener() {\n@Override\n@@ -346,39 +219,15 @@ public class MediaPlayerRecyclerView extends RecyclerView {\naddOnChildAttachStateChangeListener(new RecyclerView.OnChildAttachStateChangeListener() {\n@Override\n- public void onChildViewAttachedToWindow(@NonNull View view) {\n-\n- }\n-\n+ public void onChildViewAttachedToWindow(@NonNull View view) {}\n@Override\npublic void onChildViewDetachedFromWindow(@NonNull View view) {\n- //Logger.d(\"On Detached\");\nif (addedVideo && rowParent != null && rowParent.equals(view)) {\n- //removeVideoView(videoSurfaceView);\n- //player.stop(true);\n- //playPosition = -1;\n- //videoSurfaceView.setVisibility(INVISIBLE);\nstop();\n}\n-\n}\n});\nplayer.addListener(new Player.EventListener() {\n- @Override\n- public void onTimelineChanged(Timeline timeline, Object manifest, int reason) {\n-\n- }\n-\n- @Override\n- public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {\n-\n- }\n-\n- @Override\n- public void onLoadingChanged(boolean isLoading) {\n-\n- }\n-\n@Override\npublic void onPlayerStateChanged(boolean playWhenReady, int playbackState) {\nswitch (playbackState) {\n@@ -391,45 +240,29 @@ public class MediaPlayerRecyclerView extends RecyclerView {\ncase Player.STATE_IDLE:\nbreak;\ncase Player.STATE_READY:\n- if(videoSurfaceView!=null) {\n- videoSurfaceView.setVisibility(VISIBLE);\n- videoSurfaceView.setAlpha(1);\n- }\nbreak;\ndefault:\nbreak;\n}\n}\n-\n@Override\n- public void onRepeatModeChanged(int repeatMode) {\n-\n- }\n-\n+ public void onTimelineChanged(Timeline timeline, Object manifest, int reason) {}\n@Override\n- public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {\n-\n- }\n-\n+ public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {}\n@Override\n- public void onPlayerError(ExoPlaybackException error) {\n-\n- }\n-\n+ public void onLoadingChanged(boolean isLoading) {}\n@Override\n- public void onPositionDiscontinuity(int reason) {\n-\n- }\n-\n+ public void onRepeatModeChanged(int repeatMode) {}\n@Override\n- public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {\n-\n- }\n-\n+ public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {}\n@Override\n- public void onSeekProcessed() {\n-\n- }\n+ public void onPlayerError(ExoPlaybackException error) {}\n+ @Override\n+ public void onPositionDiscontinuity(int reason) {}\n+ @Override\n+ public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {}\n+ @Override\n+ public void onSeekProcessed() {}\n});\n}\n@@ -440,6 +273,13 @@ public class MediaPlayerRecyclerView extends RecyclerView {\n}\n}\n+ public void stop(){\n+ if (player != null){\n+ player.stop();\n+ playPosition = -1;\n+ }\n+ }\n+\npublic void onRestartPlayer() {\nif (videoSurfaceView == null) {\ninitialize(appContext);\n@@ -448,24 +288,12 @@ public class MediaPlayerRecyclerView extends RecyclerView {\n}\n}\n- /**\n- * release content\n- */\npublic void release() {\n-\nif (player != null) {\nplayer.stop();\nplayer.release();\nplayer = null;\n}\n-\nrowParent = null;\n}\n-\n- public void stop(){\n- if(player!=null){\n- player.stop();\n- playPosition = -1;\n- }\n- }\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | refactor media recycler view |
116,614 | 29.01.2019 20:48:46 | 28,800 | 3437f5a2f3e5d421217fd45bf193232280172ecc | pass player states to currently playing view | [
{
"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": "@@ -112,6 +112,17 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nreturn requiresMediaPlayer;\n}\n+ void playerReady() {\n+ FrameLayout frameLayout = getLayoutForMediaPlayer();\n+ frameLayout.setVisibility(View.VISIBLE);\n+ // TODO remove the spinner\n+ }\n+\n+ void playerLoading() {\n+ Logger.d(\"PLAYER LOADING\");\n+ // TODO show some spinner\n+ }\n+\n// TODO What to do about rotation\nboolean addMediaPlayer(PlayerView videoSurfaceView) {\n@@ -123,6 +134,7 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nreturn false;\n}\nframeLayout.removeAllViews();\n+ frameLayout.setVisibility(View.GONE); // Gets set visible in playerReady\nfinal Resources resources = context.getResources();\nfinal DisplayMetrics displayMetrics = resources.getDisplayMetrics();\n@@ -167,8 +179,6 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\n});\nframeLayout.addView(muteIcon);\n}\n- frameLayout.setVisibility(View.VISIBLE);\n-\nvideoSurfaceView.requestFocus();\nvideoSurfaceView.setShowBuffering(true);\nDefaultBandwidthMeter defaultBandwidthMeter = new DefaultBandwidthMeter();\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": "@@ -47,7 +47,7 @@ public class MediaPlayerRecyclerView extends RecyclerView {\nprivate int playPosition = -1;\nprivate boolean addedVideo = false;\n- private View rowParent;\n+ private CTInboxBaseMessageViewHolder rowParent;\n/**\n* {@inheritDoc}\n@@ -153,7 +153,7 @@ public class MediaPlayerRecyclerView extends RecyclerView {\naddedVideo = holder.addMediaPlayer(videoSurfaceView);\nif (addedVideo) {\n- rowParent = holder.itemView;\n+ rowParent = holder;\n}\n}\n@@ -222,7 +222,7 @@ public class MediaPlayerRecyclerView extends RecyclerView {\npublic void onChildViewAttachedToWindow(@NonNull View view) {}\n@Override\npublic void onChildViewDetachedFromWindow(@NonNull View view) {\n- if (addedVideo && rowParent != null && rowParent.equals(view)) {\n+ if (addedVideo && rowParent != null && rowParent.itemView.equals(view)) {\nstop();\n}\n}\n@@ -233,6 +233,9 @@ public class MediaPlayerRecyclerView extends RecyclerView {\nswitch (playbackState) {\ncase Player.STATE_BUFFERING:\n+ if (rowParent != null) {\n+ rowParent.playerLoading();\n+ }\nbreak;\ncase Player.STATE_ENDED:\nplayer.seekTo(0);\n@@ -240,6 +243,9 @@ public class MediaPlayerRecyclerView extends RecyclerView {\ncase Player.STATE_IDLE:\nbreak;\ncase Player.STATE_READY:\n+ if (rowParent != null) {\n+ rowParent.playerReady();\n+ }\nbreak;\ndefault:\nbreak;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | pass player states to currently playing view |
116,623 | 30.01.2019 22:52:57 | -19,080 | a305f20699c1533e79d1df70fed98e0e541f6cee | Added Progress bar (spinner) for loading videos and handling device rotation | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"new_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"diff": "<activity\nandroid:name=\"com.clevertap.android.sdk.CTInboxActivity\"\n- android:configChanges=\"orientation|keyboardHidden\"\n+ android:configChanges=\"keyboardHidden\"\nandroid:theme=\"@style/Theme.AppCompat.DayNight.DarkActionBar\"/>\n<receiver\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"diff": "package com.clevertap.android.sdk;\nimport android.app.Activity;\n+import android.content.res.Resources;\nimport android.graphics.Color;\nimport android.os.Handler;\nimport android.support.annotation.NonNull;\n@@ -44,6 +45,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nsquareImage = itemView.findViewById(R.id.square_media_image);\nclickLayout = itemView.findViewById(R.id.click_relative_layout);\nctaLinearLayout = itemView.findViewById(R.id.cta_linear_layout);\n+ progressBarFrameLayout = itemView.findViewById(R.id.icon_progress_frame_layout);\n}\n@Override\n@@ -136,6 +138,12 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.mediaImage.setBackgroundColor(Color.TRANSPARENT);\nthis.squareImage.setVisibility(View.GONE);\nthis.squareImage.setBackgroundColor(Color.TRANSPARENT);\n+ //Set the height and width of Progress Bar Frame to match the thumbnail size\n+ final Resources resources = context.getResources();\n+ int width = resources.getDisplayMetrics().widthPixels;\n+ int height = inboxMessage.getOrientation().equalsIgnoreCase(\"l\") ? Math.round(width * 0.5625f) : width;\n+ this.progressBarFrameLayout.setLayoutParams(new RelativeLayout.LayoutParams(width, height));\n+ this.progressBarFrameLayout.setVisibility(View.GONE);\ntry {\nswitch (inboxMessage.getOrientation()) {\ncase \"l\":\n@@ -153,6 +161,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.load(content.getMedia())\n.into(this.mediaImage);\n} else if (content.mediaIsVideo()) {\n+ this.progressBarFrameLayout.setVisibility(View.VISIBLE);\nif(!content.getPosterUrl().isEmpty()) {\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n@@ -170,6 +179,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}\n}\n}else if(content.mediaIsAudio()){\n+ this.progressBarFrameLayout.setVisibility(View.VISIBLE);\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\nthis.mediaImage.setBackgroundColor(Color.BLACK);\n@@ -196,6 +206,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.load(content.getMedia())\n.into(this.squareImage);\n} else if (content.mediaIsVideo()) {\n+ this.progressBarFrameLayout.setVisibility(View.VISIBLE);\nif(!content.getPosterUrl().isEmpty()) {\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n@@ -214,6 +225,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}\n}\n} else if (content.mediaIsAudio()){\n+ this.progressBarFrameLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nthis.squareImage.setBackgroundColor(Color.BLACK);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxActivity.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxActivity.java",
"diff": "@@ -145,7 +145,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\npublic void onTabSelected(TabLayout.Tab tab) {\nCTInboxListViewFragment fragment = (CTInboxListViewFragment) inboxTabAdapter.getItem(tab.getPosition());\nif(fragment != null && fragment.mediaRecyclerView !=null){\n- fragment.mediaRecyclerView.playVideo();\n+ fragment.mediaRecyclerView.onRestartPlayer();\n}\n}\n@@ -153,7 +153,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\npublic void onTabUnselected(TabLayout.Tab tab) {\nCTInboxListViewFragment fragment = (CTInboxListViewFragment) inboxTabAdapter.getItem(tab.getPosition());\nif(fragment != null && fragment.mediaRecyclerView != null){\n- fragment.mediaRecyclerView.stop();\n+ fragment.mediaRecyclerView.onPausePlayer();\n}\n}\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": "@@ -37,6 +37,7 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nFrameLayout frameLayout;\nContext context;\nImageView mediaImage,squareImage;\n+ FrameLayout progressBarFrameLayout;\nprivate WeakReference<CTInboxListViewFragment> parentWeakReference;\n@@ -115,12 +116,12 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nvoid playerReady() {\nFrameLayout frameLayout = getLayoutForMediaPlayer();\nframeLayout.setVisibility(View.VISIBLE);\n- // TODO remove the spinner\n+ progressBarFrameLayout.setVisibility(View.GONE);\n}\nvoid playerLoading() {\n- Logger.d(\"PLAYER LOADING\");\n- // TODO show some spinner\n+ Logger.d(\"Player Loading...\");\n+ progressBarFrameLayout.setVisibility(View.VISIBLE);\n}\n// TODO What to do about rotation\n@@ -179,8 +180,9 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\n});\nframeLayout.addView(muteIcon);\n}\n+\nvideoSurfaceView.requestFocus();\n- videoSurfaceView.setShowBuffering(true);\n+ videoSurfaceView.setShowBuffering(false);\nDefaultBandwidthMeter defaultBandwidthMeter = new DefaultBandwidthMeter();\nDataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(context,\nUtil.getUserAgent(context, context.getPackageName()), defaultBandwidthMeter);\n@@ -190,6 +192,7 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\n// Prepare the player with the source.\nplayer.prepare(hlsMediaSource);\nif(firstContentItem.mediaIsAudio()) {\n+ videoSurfaceView.showController();//show controller for audio as it is not autoplay\nplayer.setPlayWhenReady(false);\nplayer.setVolume(1f);\n}else if(firstContentItem.mediaIsVideo()){\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": "@@ -7,6 +7,7 @@ import android.net.Uri;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.os.Looper;\n+import android.os.Parcelable;\nimport android.support.annotation.NonNull;\nimport android.support.annotation.Nullable;\nimport android.support.v4.app.Fragment;\n@@ -37,7 +38,7 @@ public class CTInboxListViewFragment extends Fragment {\nboolean haveVideoPlayerSupport = CleverTapAPI.haveVideoPlayerSupport;\nCTInboxStyleConfig styleConfig;\nprivate WeakReference<CTInboxListViewFragment.InboxListener> listenerWeakReference;\n-\n+ LinearLayout linearLayout;\nprivate boolean firstTime = true;\nprivate int tabPosition;\n@@ -103,7 +104,7 @@ public class CTInboxListViewFragment extends Fragment {\n@Override\npublic View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {\nView allView = inflater.inflate(R.layout.inbox_list_view,container,false);\n- LinearLayout linearLayout = allView.findViewById(R.id.list_view_linear_layout);\n+ linearLayout = allView.findViewById(R.id.list_view_linear_layout);\nlinearLayout.setBackgroundColor(Color.parseColor(styleConfig.getInboxBackgroundColor()));\nTextView noMessageView = allView.findViewById(R.id.list_view_no_message_view);\n@@ -254,4 +255,44 @@ public class CTInboxListViewFragment extends Fragment {\n// Ignore\n}\n}\n+\n+ @Override\n+ public void onSaveInstanceState(@NonNull Bundle outState) {\n+ super.onSaveInstanceState(outState);\n+ if(mediaRecyclerView.getLayoutManager()!=null) {\n+ outState.putParcelable(\"recyclerLayoutState\", mediaRecyclerView.getLayoutManager().onSaveInstanceState());\n+ }\n+ }\n+\n+ @Override\n+ public void onViewStateRestored(@Nullable Bundle savedInstanceState) {\n+ super.onViewStateRestored(savedInstanceState);\n+ if(savedInstanceState != null) {\n+ Parcelable savedRecyclerLayoutState = savedInstanceState.getParcelable(\"recyclerLayoutState\");\n+ if (mediaRecyclerView != null) {\n+ linearLayout.removeAllViews();\n+ final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity());\n+ final CTInboxMessageAdapter inboxMessageAdapter = new CTInboxMessageAdapter(inboxMessages, this);\n+ mediaRecyclerView.setLayoutManager(linearLayoutManager);\n+ mediaRecyclerView.addItemDecoration(new VerticalSpaceItemDecoration(18));\n+ mediaRecyclerView.setItemAnimator(new DefaultItemAnimator());\n+ mediaRecyclerView.setAdapter(inboxMessageAdapter);\n+ inboxMessageAdapter.notifyDataSetChanged();\n+ if(mediaRecyclerView.getLayoutManager()!=null) {\n+ mediaRecyclerView.getLayoutManager().onRestoreInstanceState(savedRecyclerLayoutState);\n+ }\n+ linearLayout.addView(mediaRecyclerView);\n+\n+ if (firstTime && shouldAutoPlayOnFirstLaunch()) {\n+ new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {\n+ @Override\n+ public void run() {\n+ mediaRecyclerView.playVideo();\n+ }\n+ }, 1000);\n+ firstTime = false;\n+ }\n+ }\n+ }\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"diff": "package com.clevertap.android.sdk;\nimport android.app.Activity;\n+import android.content.res.Resources;\nimport android.graphics.Color;\nimport android.os.Handler;\nimport android.support.annotation.NonNull;\nimport android.view.View;\nimport android.widget.Button;\nimport android.widget.ImageView;\n+import android.widget.RelativeLayout;\nimport android.widget.TextView;\nimport com.bumptech.glide.Glide;\n@@ -45,6 +47,8 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nclickLayout = itemView.findViewById(R.id.click_relative_layout);\nctaLinearLayout = itemView.findViewById(R.id.cta_linear_layout);\nbodyRelativeLayout = itemView.findViewById(R.id.body_relative_layout);\n+ progressBarFrameLayout = itemView.findViewById(R.id.simple_progress_frame_layout);\n+\n}\n@Override\n@@ -136,6 +140,12 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.mediaImage.setBackgroundColor(Color.TRANSPARENT);\nthis.squareImage.setVisibility(View.GONE);\nthis.squareImage.setBackgroundColor(Color.TRANSPARENT);\n+ //Set the height and width of Progress Bar Frame to match the thumbnail size\n+ final Resources resources = context.getResources();\n+ int width = resources.getDisplayMetrics().widthPixels;\n+ int height = inboxMessage.getOrientation().equalsIgnoreCase(\"l\") ? Math.round(width * 0.5625f) : width;\n+ this.progressBarFrameLayout.setLayoutParams(new RelativeLayout.LayoutParams(width, height));\n+ this.progressBarFrameLayout.setVisibility(View.GONE);\ntry {\nswitch (inboxMessage.getOrientation()) {\ncase \"l\":\n@@ -153,6 +163,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.load(content.getMedia())\n.into(this.mediaImage);\n} else if (content.mediaIsVideo()) {\n+ this.progressBarFrameLayout.setVisibility(View.VISIBLE);\nif(!content.getPosterUrl().isEmpty()) {\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n@@ -170,6 +181,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}\n}\n}else if(content.mediaIsAudio()){\n+ this.progressBarFrameLayout.setVisibility(View.VISIBLE);\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\nthis.mediaImage.setBackgroundColor(Color.BLACK);\n@@ -196,6 +208,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.load(content.getMedia())\n.into(this.squareImage);\n} else if (content.mediaIsVideo()) {\n+ this.progressBarFrameLayout.setVisibility(View.VISIBLE);\nif(!content.getPosterUrl().isEmpty()) {\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n@@ -214,6 +227,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}\n}\n}else if(content.mediaIsAudio()){\n+ this.progressBarFrameLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nthis.squareImage.setBackgroundColor(Color.BLACK);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout/inbox_icon_message_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout/inbox_icon_message_layout.xml",
"diff": "android:layout_marginLeft=\"20dp\"\nandroid:layout_marginTop=\"5dp\"\nandroid:layout_marginRight=\"20dp\"\n- android:textColor=\"@android:color/darker_gray\"\n- android:layout_below=\"@+id/messageTitle\"/>\n+ android:textColor=\"@android:color/darker_gray\" />\n</LinearLayout>\n</LinearLayout>\n<RelativeLayout\nandroid:visibility=\"gone\"\nandroid:layout_height=\"wrap_content\">\n</FrameLayout>\n+ <FrameLayout\n+ android:id=\"@+id/icon_progress_frame_layout\"\n+ android:layout_width=\"fill_parent\"\n+ android:layout_height=\"fill_parent\"\n+ android:visibility=\"gone\">\n+ <ProgressBar\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_gravity=\"center_horizontal|center_vertical\"\n+ android:visibility=\"visible\"/>\n+ </FrameLayout>\n</RelativeLayout>\n<LinearLayout\nandroid:id=\"@+id/timestamp_linear_layout\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout/inbox_simple_message_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout/inbox_simple_message_layout.xml",
"diff": "android:visibility=\"gone\"\nandroid:layout_height=\"wrap_content\">\n</FrameLayout>\n+ <FrameLayout\n+ android:id=\"@+id/simple_progress_frame_layout\"\n+ android:layout_width=\"fill_parent\"\n+ android:layout_height=\"fill_parent\"\n+ android:visibility=\"gone\">\n+ <ProgressBar\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_gravity=\"center_horizontal|center_vertical\"\n+ android:visibility=\"visible\"/>\n+ </FrameLayout>\n</RelativeLayout>\n<RelativeLayout\nandroid:id=\"@+id/body_relative_layout\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Added Progress bar (spinner) for loading videos and handling device rotation |
116,614 | 30.01.2019 20:18:19 | 28,800 | e5f620cb77543c76f4573562e8ac52a017ef842b | revamp inbox autoplay logic | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"diff": "@@ -161,7 +161,6 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.load(content.getMedia())\n.into(this.mediaImage);\n} else if (content.mediaIsVideo()) {\n- this.progressBarFrameLayout.setVisibility(View.VISIBLE);\nif(!content.getPosterUrl().isEmpty()) {\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n@@ -179,7 +178,6 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}\n}\n} else if(content.mediaIsAudio()){\n- this.progressBarFrameLayout.setVisibility(View.VISIBLE);\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\nthis.mediaImage.setBackgroundColor(Color.BLACK);\n@@ -206,7 +204,6 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.load(content.getMedia())\n.into(this.squareImage);\n} else if (content.mediaIsVideo()) {\n- this.progressBarFrameLayout.setVisibility(View.VISIBLE);\nif(!content.getPosterUrl().isEmpty()) {\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n@@ -225,7 +222,6 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}\n}\n} else if (content.mediaIsAudio()){\n- this.progressBarFrameLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nthis.squareImage.setBackgroundColor(Color.BLACK);\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": "@@ -113,19 +113,23 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nreturn requiresMediaPlayer;\n}\n+ boolean shouldAutoPlay() {\n+ return firstContentItem.mediaIsVideo();\n+ }\n+\nvoid playerReady() {\nFrameLayout frameLayout = getLayoutForMediaPlayer();\nframeLayout.setVisibility(View.VISIBLE);\n+ if (progressBarFrameLayout != null) {\nprogressBarFrameLayout.setVisibility(View.GONE);\n}\n-\n- void playerLoading() {\n- Logger.d(\"Player Loading...\");\n- progressBarFrameLayout.setVisibility(View.VISIBLE);\n}\n- // TODO What to do about rotation\n-\n+ void playerRemoved() {\n+ if (progressBarFrameLayout != null) {\n+ progressBarFrameLayout.setVisibility(View.GONE);\n+ }\n+ }\nboolean addMediaPlayer(PlayerView videoSurfaceView) {\nif (!requiresMediaPlayer) {\nreturn false;\n@@ -147,6 +151,10 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nint color = Color.BLACK;\nframeLayout.setBackgroundColor(color);\n+ if (progressBarFrameLayout != null) {\n+ progressBarFrameLayout.setVisibility(View.VISIBLE);\n+ }\n+\nfinal SimpleExoPlayer player = (SimpleExoPlayer) videoSurfaceView.getPlayer();\nfloat currentVolume = player.getVolume();\nif (firstContentItem.mediaIsVideo()) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"diff": "@@ -163,7 +163,6 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.load(content.getMedia())\n.into(this.mediaImage);\n} else if (content.mediaIsVideo()) {\n- this.progressBarFrameLayout.setVisibility(View.VISIBLE);\nif(!content.getPosterUrl().isEmpty()) {\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n@@ -181,7 +180,6 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}\n}\n}else if(content.mediaIsAudio()){\n- this.progressBarFrameLayout.setVisibility(View.VISIBLE);\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\nthis.mediaImage.setBackgroundColor(Color.BLACK);\n@@ -208,7 +206,6 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.load(content.getMedia())\n.into(this.squareImage);\n} else if (content.mediaIsVideo()) {\n- this.progressBarFrameLayout.setVisibility(View.VISIBLE);\nif(!content.getPosterUrl().isEmpty()) {\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n@@ -227,7 +224,6 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}\n}\n}else if(content.mediaIsAudio()){\n- this.progressBarFrameLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nthis.squareImage.setBackgroundColor(Color.BLACK);\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": "@@ -2,16 +2,14 @@ package com.clevertap.android.sdk;\nimport android.content.Context;\nimport android.graphics.Color;\n-import android.graphics.Point;\n+import android.graphics.Rect;\nimport android.graphics.drawable.Drawable;\nimport android.support.annotation.NonNull;\nimport android.support.v7.widget.LinearLayoutManager;\nimport android.support.v7.widget.RecyclerView;\nimport android.util.AttributeSet;\n-import android.view.Display;\nimport android.view.View;\nimport android.view.ViewGroup;\n-import android.view.WindowManager;\nimport android.widget.AbsListView;\nimport com.google.android.exoplayer2.ExoPlaybackException;\n@@ -33,21 +31,11 @@ import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;\npublic class MediaPlayerRecyclerView extends RecyclerView {\n- private int videoSurfaceDefaultHeight = 0;\n- private int screenDefaultHeight = 0;\nSimpleExoPlayer player;\n//surface view for playing video\nprivate PlayerView videoSurfaceView;\nprivate Context appContext;\n- int targetPosition;\n-\n- /**\n- * the position of playing video\n- */\n- private int playPosition = -1;\n-\n- private boolean addedVideo = false;\n- private CTInboxBaseMessageViewHolder rowParent;\n+ private CTInboxBaseMessageViewHolder playingHolder;\n/**\n* {@inheritDoc}\n@@ -85,108 +73,11 @@ public class MediaPlayerRecyclerView extends RecyclerView {\ninitialize(context);\n}\n- /**\n- * prepare for video play\n- */\n- //remove the player from the row\n- private void removeVideoView(PlayerView videoView) {\n- ViewGroup parent = (ViewGroup) videoView.getParent();\n- if (parent == null) {\n- return;\n- }\n- int index = parent.indexOfChild(videoView);\n- if (index >= 0) {\n- parent.removeViewAt(index);\n- addedVideo = false;\n- }\n- }\n-\n- public void playVideo() {\n- //noinspection ConstantConditions\n- int startPosition = ((LinearLayoutManager) getLayoutManager()).findFirstVisibleItemPosition();\n- int endPosition = ((LinearLayoutManager) getLayoutManager()).findLastVisibleItemPosition();\n-\n- if (endPosition - startPosition > 1) {\n- endPosition = startPosition + 1;\n- }\n- if (startPosition < 0 || endPosition < 0) {\n- return;\n- }\n-\n- if (startPosition != endPosition) {\n- int startPositionVideoHeight = getVisibleVideoSurfaceHeight(startPosition);\n- int endPositionVideoHeight = getVisibleVideoSurfaceHeight(endPosition);\n- targetPosition = startPositionVideoHeight > endPositionVideoHeight ? startPosition : endPosition;\n- } else {\n- targetPosition = startPosition;\n- }\n-\n- //noinspection ConstantConditions\n- if (targetPosition < 0 || targetPosition == playPosition) {\n- return;\n- }\n- playPosition = targetPosition;\n- if (videoSurfaceView == null) {\n- return;\n- }\n-\n- removeVideoView(videoSurfaceView);\n-\n- // get target View targetPosition in RecyclerView\n- int at = targetPosition - ((LinearLayoutManager) getLayoutManager()).findFirstVisibleItemPosition();\n-\n- View child = getChildAt(at);\n- if (child == null) {\n- return;\n- }\n-\n- CTInboxBaseMessageViewHolder holder = (CTInboxBaseMessageViewHolder) child.getTag();\n-\n- if (holder == null) {\n- playPosition = -1;\n- return;\n- }\n-\n- if (!holder.needsMediaPlayer()) {\n- return;\n- }\n-\n- addedVideo = holder.addMediaPlayer(videoSurfaceView);\n- if (addedVideo) {\n- rowParent = holder;\n- }\n- }\n-\n- private int getVisibleVideoSurfaceHeight(int playPosition) {\n- //noinspection ConstantConditions\n- int at = playPosition - ((LinearLayoutManager) getLayoutManager()).findFirstVisibleItemPosition();\n- View child = getChildAt(at);\n- if (child == null) {\n- return 0;\n- }\n- int[] location01 = new int[2];\n- child.getLocationInWindow(location01);\n- if (location01[1] < 0) {\n- return location01[1] + videoSurfaceDefaultHeight;\n- } else {\n- return screenDefaultHeight - location01[1];\n- }\n- }\n-\nprivate void initialize(Context context) {\nappContext = context.getApplicationContext();\n- //noinspection ConstantConditions\n- Display display = ((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();\n- Point point = new Point();\n- display.getSize(point);\n- //noinspection SuspiciousNameCombination\n- videoSurfaceDefaultHeight = point.x;\n-\n- screenDefaultHeight = point.y;\nvideoSurfaceView = new PlayerView(appContext);\nvideoSurfaceView.setBackgroundColor(Color.TRANSPARENT);\nvideoSurfaceView.setResizeMode(AspectRatioFrameLayout.RESIZE_MODE_FIT);\n-\nvideoSurfaceView.setUseArtwork(true);\nDrawable artwork = context.getResources().getDrawable(R.drawable.ct_audio);\nvideoSurfaceView.setDefaultArtwork(Utils.drawableToBitmap(artwork));\n@@ -198,6 +89,7 @@ public class MediaPlayerRecyclerView extends RecyclerView {\nnew DefaultTrackSelector(videoTrackSelectionFactory);\nplayer = ExoPlayerFactory.newSimpleInstance(appContext, trackSelector);\n+ player.setVolume(0f); // start off muted\nvideoSurfaceView.setUseController(true);\nvideoSurfaceView.setControllerAutoShow(false);\nvideoSurfaceView.setPlayer(player);\n@@ -222,7 +114,7 @@ public class MediaPlayerRecyclerView extends RecyclerView {\npublic void onChildViewAttachedToWindow(@NonNull View view) {}\n@Override\npublic void onChildViewDetachedFromWindow(@NonNull View view) {\n- if (addedVideo && rowParent != null && rowParent.itemView.equals(view)) {\n+ if (playingHolder != null && playingHolder.itemView.equals(view)) {\nstop();\n}\n}\n@@ -231,11 +123,7 @@ public class MediaPlayerRecyclerView extends RecyclerView {\n@Override\npublic void onPlayerStateChanged(boolean playWhenReady, int playbackState) {\nswitch (playbackState) {\n-\ncase Player.STATE_BUFFERING:\n- if (rowParent != null) {\n- rowParent.playerLoading();\n- }\nbreak;\ncase Player.STATE_ENDED:\nplayer.seekTo(0);\n@@ -243,8 +131,8 @@ public class MediaPlayerRecyclerView extends RecyclerView {\ncase Player.STATE_IDLE:\nbreak;\ncase Player.STATE_READY:\n- if (rowParent != null) {\n- rowParent.playerReady();\n+ if (playingHolder != null) {\n+ playingHolder.playerReady();\n}\nbreak;\ndefault:\n@@ -272,9 +160,100 @@ public class MediaPlayerRecyclerView extends RecyclerView {\n});\n}\n+ private CTInboxBaseMessageViewHolder findBestVisibleMediaHolder() {\n+ CTInboxBaseMessageViewHolder bestHolder = null;\n+\n+ //noinspection ConstantConditions\n+ int startPosition = ((LinearLayoutManager) getLayoutManager()).findFirstVisibleItemPosition();\n+ int endPosition = ((LinearLayoutManager) getLayoutManager()).findLastVisibleItemPosition();\n+\n+ int bestHeight = 0;\n+ for (int i=startPosition; i<=endPosition; i++) {\n+ int pos = i - startPosition;\n+ View child = getChildAt(pos);\n+ if (child == null) {\n+ continue;\n+ }\n+ CTInboxBaseMessageViewHolder holder = (CTInboxBaseMessageViewHolder) child.getTag();\n+ if (!holder.needsMediaPlayer()) {\n+ continue;\n+ }\n+ Rect rect = new Rect();\n+ boolean measured = holder.itemView.getGlobalVisibleRect(rect);\n+ int height = measured ? rect.height() : 0;\n+ if (height > bestHeight) {\n+ bestHeight = height;\n+ bestHolder = holder;\n+ }\n+ }\n+ return bestHolder;\n+ }\n+ public void playVideo() {\n+ if (videoSurfaceView == null) {\n+ return;\n+ }\n+ CTInboxBaseMessageViewHolder targetHolder = findBestVisibleMediaHolder();\n+ if(targetHolder == null) {\n+ stop();\n+ removeVideoView();\n+ return;\n+ }\n+\n+ if (playingHolder != null && playingHolder.itemView.equals(targetHolder.itemView)) {\n+ Rect rect = new Rect();\n+ boolean measured = playingHolder.itemView.getGlobalVisibleRect(rect);\n+ int visibleHeight = measured ? rect.height() : 0;\n+ if (player != null) {\n+ boolean play = visibleHeight >= 400;\n+ if (play) {\n+ if (playingHolder.shouldAutoPlay()) {\n+ player.setPlayWhenReady(true);\n+ }\n+ } else {\n+ player.setPlayWhenReady(false);\n+ }\n+\n+ }\n+ return;\n+ }\n+\n+ removeVideoView();\n+ boolean addedVideo = targetHolder.addMediaPlayer(videoSurfaceView);\n+ if (addedVideo) {\n+ playingHolder = targetHolder;\n+ }\n+ }\n+\n+ private void removeVideoView() {\n+ if (videoSurfaceView == null) {\n+ return;\n+ }\n+ ViewGroup parent = (ViewGroup) videoSurfaceView.getParent();\n+ if (parent == null) {\n+ return;\n+ }\n+ int index = parent.indexOfChild(videoSurfaceView);\n+ if (index >= 0) {\n+ parent.removeViewAt(index);\n+ if (player != null) {\n+ player.stop();\n+ }\n+ if (playingHolder != null) {\n+ playingHolder.playerRemoved();\n+ playingHolder = null;\n+ }\n+ }\n+ }\n+\npublic void onPausePlayer() {\n+ if (player != null){\n+ player.setPlayWhenReady(false);\n+ }\n+ }\n+ @SuppressWarnings({\"unused\"})\n+ public void removePlayer() {\nif (videoSurfaceView != null) {\n- stop();\n+ removeVideoView();\nvideoSurfaceView = null;\n}\n}\n@@ -282,14 +261,13 @@ public class MediaPlayerRecyclerView extends RecyclerView {\npublic void stop(){\nif (player != null){\nplayer.stop();\n- playPosition = -1;\n}\n+ playingHolder = null;\n}\npublic void onRestartPlayer() {\nif (videoSurfaceView == null) {\ninitialize(appContext);\n- playPosition = -1;\nplayVideo();\n}\n}\n@@ -300,6 +278,7 @@ public class MediaPlayerRecyclerView extends RecyclerView {\nplayer.release();\nplayer = null;\n}\n- rowParent = null;\n+ playingHolder = null;\n+ videoSurfaceView = null;\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | revamp inbox autoplay logic |
116,623 | 01.02.2019 00:31:10 | -19,080 | 0dfe24b56633ee542bbee9f4732ef910d64042b3 | Fixed media player issue with Tabs on rotation of device | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxActivity.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxActivity.java",
"diff": "@@ -6,6 +6,7 @@ import android.graphics.PorterDuff;\nimport android.graphics.drawable.Drawable;\nimport android.os.Bundle;\nimport android.support.design.widget.TabLayout;\n+import android.support.v4.app.Fragment;\nimport android.support.v4.app.FragmentActivity;\nimport android.support.v4.view.ViewPager;\nimport android.support.v7.widget.Toolbar;\n@@ -16,11 +17,18 @@ import android.widget.TextView;\nimport java.lang.ref.WeakReference;\nimport java.util.ArrayList;\n+import java.util.List;\n/**\n* This activity shows the {@link CTInboxMessage} objects as per {@link CTInboxStyleConfig} style parameters\n*/\npublic class CTInboxActivity extends FragmentActivity implements CTInboxListViewFragment.InboxListener {\n+\n+ CTInboxTabAdapter inboxTabAdapter;\n+ TabLayout tabLayout;\n+ ViewPager viewPager;\n+ CTInboxStyleConfig styleConfig;\n+\ninterface InboxActivityListener{\nvoid messageDidShow(CTInboxActivity ctInboxActivity, CTInboxMessage inboxMessage, Bundle data);\nvoid messageDidClick(CTInboxActivity ctInboxActivity, CTInboxMessage inboxMessage, Bundle data);\n@@ -51,7 +59,6 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\npublic void onCreate(Bundle savedInstanceState){\nsuper.onCreate(savedInstanceState);\n- CTInboxStyleConfig styleConfig;\nCleverTapAPI cleverTapAPI;\ntry{\nBundle extras = getIntent().getExtras();\n@@ -86,8 +93,8 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nLinearLayout linearLayout = findViewById(R.id.inbox_linear_layout);\nlinearLayout.setBackgroundColor(Color.parseColor(styleConfig.getInboxBackgroundColor()));\n- final TabLayout tabLayout = linearLayout.findViewById(R.id.tab_layout);\n- final ViewPager viewPager = linearLayout.findViewById(R.id.view_pager);\n+ tabLayout = linearLayout.findViewById(R.id.tab_layout);\n+ viewPager = linearLayout.findViewById(R.id.view_pager);\nTextView noMessageView = findViewById(R.id.no_message_view);\nBundle bundle = new Bundle();\nbundle.putParcelable(\"config\", config);\n@@ -111,20 +118,20 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\n}\n} else {\nviewPager.setVisibility(View.VISIBLE);\n- final CTInboxTabAdapter inboxTabAdapter = new CTInboxTabAdapter(getSupportFragmentManager());\n+ ArrayList<String>tabs = styleConfig.getTabs();\n+ inboxTabAdapter = new CTInboxTabAdapter(getSupportFragmentManager(),tabs.size()+1);\ntabLayout.setVisibility(View.VISIBLE);\n+ tabLayout.setTabGravity(TabLayout.GRAVITY_FILL);\n+ tabLayout.setTabMode(TabLayout.MODE_FIXED);\ntabLayout.setSelectedTabIndicatorColor(Color.parseColor(styleConfig.getSelectedTabIndicatorColor()));\ntabLayout.setTabTextColors(Color.parseColor(styleConfig.getUnselectedTabColor()),Color.parseColor(styleConfig.getSelectedTabColor()));\ntabLayout.setBackgroundColor(Color.parseColor(styleConfig.getTabBackgroundColor()));\n- tabLayout.addTab(tabLayout.newTab().setText(\"ALL\"));\nBundle _allBundle = (Bundle)bundle.clone();\n_allBundle.putInt(\"position\",0);\nCTInboxListViewFragment all = new CTInboxListViewFragment();\nall.setArguments(_allBundle);\n- inboxTabAdapter.addFragment(all,\"ALL\");\n-\n- ArrayList<String>tabs = styleConfig.getTabs();\n+ inboxTabAdapter.addFragment(all,\"ALL\",0);\nfor (int i=0; i<tabs.size(); i++) {\nString filter = tabs.get(i);\n@@ -134,26 +141,27 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\n_bundle.putString(\"filter\", filter);\nCTInboxListViewFragment frag = new CTInboxListViewFragment();\nfrag.setArguments(_bundle);\n- inboxTabAdapter.addFragment(frag, filter);\n+ inboxTabAdapter.addFragment(frag, filter,pos);\nviewPager.setOffscreenPageLimit(pos);\n}\nviewPager.setAdapter(inboxTabAdapter);\n+ inboxTabAdapter.notifyDataSetChanged();\nviewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));\ntabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {\n@Override\npublic void onTabSelected(TabLayout.Tab tab) {\nCTInboxListViewFragment fragment = (CTInboxListViewFragment) inboxTabAdapter.getItem(tab.getPosition());\n- if(fragment != null && fragment.mediaRecyclerView !=null){\n- fragment.mediaRecyclerView.onRestartPlayer();\n+ if(fragment != null && fragment.getMediaRecyclerView() !=null){\n+ fragment.getMediaRecyclerView().onRestartPlayer();\n}\n}\n@Override\npublic void onTabUnselected(TabLayout.Tab tab) {\nCTInboxListViewFragment fragment = (CTInboxListViewFragment) inboxTabAdapter.getItem(tab.getPosition());\n- if(fragment != null && fragment.mediaRecyclerView != null){\n- fragment.mediaRecyclerView.onPausePlayer();\n+ if(fragment != null && fragment.getMediaRecyclerView() != null){\n+ fragment.getMediaRecyclerView().onPausePlayer();\n}\n}\n@@ -189,4 +197,18 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nlistener.messageDidShow(this,inboxMessage, data);\n}\n}\n+\n+ @Override\n+ protected void onDestroy() {\n+ if(styleConfig.isUsingTabs()) {\n+ List<Fragment> allFragments = getSupportFragmentManager().getFragments();\n+ for (Fragment fragment : allFragments) {\n+ if (fragment instanceof CTInboxListViewFragment) {\n+ Logger.d(\"Removing fragment - \" + fragment.toString());\n+ getSupportFragmentManager().getFragments().remove(fragment);\n+ }\n+ }\n+ }\n+ super.onDestroy();\n+ }\n}\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": "@@ -43,6 +43,7 @@ public class CTInboxListViewFragment extends Fragment {\nprivate int tabPosition;\nMediaPlayerRecyclerView mediaRecyclerView;\n+ RecyclerView recyclerView;\nprivate boolean shouldAutoPlayOnFirstLaunch() {\nreturn tabPosition <= 0;\n@@ -120,6 +121,8 @@ public class CTInboxListViewFragment extends Fragment {\nif (haveVideoPlayerSupport) {\nmediaRecyclerView = new MediaPlayerRecyclerView(getActivity());\n+ Logger.d(\"ListView added - \"+ mediaRecyclerView.toString());\n+ setMediaRecyclerView(mediaRecyclerView);\nmediaRecyclerView.setVisibility(View.VISIBLE);\nmediaRecyclerView.setLayoutManager(linearLayoutManager);\nmediaRecyclerView.addItemDecoration(new VerticalSpaceItemDecoration(18));\n@@ -140,7 +143,7 @@ public class CTInboxListViewFragment extends Fragment {\n}\n} else {\n- RecyclerView recyclerView = allView.findViewById(R.id.list_view_recycler_view);\n+ recyclerView = allView.findViewById(R.id.list_view_recycler_view);\nrecyclerView.setVisibility(View.VISIBLE);\nrecyclerView.setLayoutManager(linearLayoutManager);\nrecyclerView.addItemDecoration(new VerticalSpaceItemDecoration(18));\n@@ -256,41 +259,44 @@ public class CTInboxListViewFragment extends Fragment {\n}\n}\n+ MediaPlayerRecyclerView getMediaRecyclerView() {\n+ return this.mediaRecyclerView;\n+ }\n+\n+ void setMediaRecyclerView(MediaPlayerRecyclerView mediaRecyclerView) {\n+ this.mediaRecyclerView = mediaRecyclerView;\n+ }\n+\n@Override\npublic void onSaveInstanceState(@NonNull Bundle outState) {\nsuper.onSaveInstanceState(outState);\n+ if(mediaRecyclerView != null) {\nif (mediaRecyclerView.getLayoutManager() != null) {\noutState.putParcelable(\"recyclerLayoutState\", mediaRecyclerView.getLayoutManager().onSaveInstanceState());\n}\n}\n+ if(recyclerView != null) {\n+ if (recyclerView.getLayoutManager() != null) {\n+ outState.putParcelable(\"recyclerLayoutState\", recyclerView.getLayoutManager().onSaveInstanceState());\n+ }\n+ }\n+ }\n+\n@Override\npublic void onViewStateRestored(@Nullable Bundle savedInstanceState) {\nsuper.onViewStateRestored(savedInstanceState);\nif(savedInstanceState != null) {\nParcelable savedRecyclerLayoutState = savedInstanceState.getParcelable(\"recyclerLayoutState\");\nif (mediaRecyclerView != null) {\n- linearLayout.removeAllViews();\n- final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity());\n- final CTInboxMessageAdapter inboxMessageAdapter = new CTInboxMessageAdapter(inboxMessages, this);\n- mediaRecyclerView.setLayoutManager(linearLayoutManager);\n- mediaRecyclerView.addItemDecoration(new VerticalSpaceItemDecoration(18));\n- mediaRecyclerView.setItemAnimator(new DefaultItemAnimator());\n- mediaRecyclerView.setAdapter(inboxMessageAdapter);\n- inboxMessageAdapter.notifyDataSetChanged();\nif(mediaRecyclerView.getLayoutManager()!=null) {\nmediaRecyclerView.getLayoutManager().onRestoreInstanceState(savedRecyclerLayoutState);\n}\n- linearLayout.addView(mediaRecyclerView);\n-\n- if (firstTime && shouldAutoPlayOnFirstLaunch()) {\n- new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {\n- @Override\n- public void run() {\n- mediaRecyclerView.playVideo();\n}\n- }, 1000);\n- firstTime = false;\n+\n+ if (recyclerView != null) {\n+ if(recyclerView.getLayoutManager()!=null) {\n+ recyclerView.getLayoutManager().onRestoreInstanceState(savedRecyclerLayoutState);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxTabAdapter.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxTabAdapter.java",
"diff": "package com.clevertap.android.sdk;\n+import android.support.annotation.NonNull;\nimport android.support.annotation.Nullable;\nimport android.support.v4.app.Fragment;\nimport android.support.v4.app.FragmentManager;\n-import android.support.v4.app.FragmentStatePagerAdapter;\n+import android.support.v4.app.FragmentPagerAdapter;\n+import android.view.ViewGroup;\nimport java.util.ArrayList;\nimport java.util.List;\n@@ -12,23 +14,24 @@ import java.util.List;\n* Custom PagerAdapter for Notification Inbox tabs\n*/\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\n-public class CTInboxTabAdapter extends FragmentStatePagerAdapter {\n+public class CTInboxTabAdapter extends FragmentPagerAdapter {\n- private final List<Fragment> fragmentList = new ArrayList<>();\n+ private final Fragment[] fragmentList ;\nprivate final List<String> fragmentTitleList = new ArrayList<>();\n- public CTInboxTabAdapter(FragmentManager fm) {\n+ public CTInboxTabAdapter(FragmentManager fm, int size) {\nsuper(fm);\n+ fragmentList = new Fragment[size];\n}\n@Override\npublic Fragment getItem(int position) {\n- return fragmentList.get(position);\n+ return fragmentList[position];\n}\n@Override\npublic int getCount() {\n- return fragmentList.size();\n+ return fragmentList.length;\n}\n@Nullable\n@@ -37,8 +40,16 @@ public class CTInboxTabAdapter extends FragmentStatePagerAdapter {\nreturn fragmentTitleList.get(position);\n}\n- void addFragment(Fragment fragment, String title){\n- fragmentList.add(fragment);\n+ void addFragment(Fragment fragment, String title, int position){\n+ fragmentList[position] = fragment;\nfragmentTitleList.add(title);\n}\n+\n+ @NonNull\n+ @Override\n+ public Object instantiateItem(@NonNull ViewGroup container, int position) {\n+ Object ret = super.instantiateItem(container, position);\n+ fragmentList[position] = (Fragment) ret;\n+ return ret;\n+ }\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fixed media player issue with Tabs on rotation of device |
116,623 | 01.02.2019 16:20:56 | -19,080 | dbee39a00e2c9203ac0b1dad932cdfa33c980262 | Fixed maintaining position on rotation without tabs | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxActivity.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxActivity.java",
"diff": "@@ -109,13 +109,21 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nnoMessageView.setBackgroundColor(Color.parseColor(styleConfig.getInboxBackgroundColor()));\nnoMessageView.setVisibility(View.VISIBLE);\n}else {\n+ boolean fragmentExists = false;\nnoMessageView.setVisibility(View.GONE);\n+ for(Fragment fragment : getSupportFragmentManager().getFragments()){\n+ if(fragment.getTag()!=null && !fragment.getTag().equalsIgnoreCase(getFragmentTag())){\n+ fragmentExists = true;\n+ }\n+ }\n+ if(!fragmentExists){\nCTInboxListViewFragment listView = new CTInboxListViewFragment();\nlistView.setArguments(bundle);\ngetSupportFragmentManager().beginTransaction()\n.add(R.id.list_view_fragment, listView, getFragmentTag())\n.commit();\n}\n+ }\n} else {\nviewPager.setVisibility(View.VISIBLE);\nArrayList<String>tabs = styleConfig.getTabs();\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": "@@ -121,7 +121,6 @@ public class CTInboxListViewFragment extends Fragment {\nif (haveVideoPlayerSupport) {\nmediaRecyclerView = new MediaPlayerRecyclerView(getActivity());\n- Logger.d(\"ListView added - \"+ mediaRecyclerView.toString());\nsetMediaRecyclerView(mediaRecyclerView);\nmediaRecyclerView.setVisibility(View.VISIBLE);\nmediaRecyclerView.setLayoutManager(linearLayoutManager);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fixed maintaining position on rotation without tabs |
116,623 | 01.02.2019 17:24:55 | -19,080 | d218a2f5cb9a8c3f29380a584888cb9a79ebed75 | Fixing inbox message UI as per dashboard preview | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"diff": "@@ -135,9 +135,9 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}\nthis.mediaImage.setVisibility(View.GONE);\n- this.mediaImage.setBackgroundColor(Color.TRANSPARENT);\n+ this.mediaImage.setBackgroundColor(Color.parseColor(inboxMessage.getBgColor()));\nthis.squareImage.setVisibility(View.GONE);\n- this.squareImage.setBackgroundColor(Color.TRANSPARENT);\n+ this.squareImage.setBackgroundColor(Color.parseColor(inboxMessage.getBgColor()));\n//Set the height and width of Progress Bar Frame to match the thumbnail size\nfinal Resources resources = context.getResources();\nint width = resources.getDisplayMetrics().widthPixels;\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": "@@ -130,6 +130,12 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nprogressBarFrameLayout.setVisibility(View.GONE);\n}\n}\n+\n+ void playerBuffering(){\n+ if (progressBarFrameLayout != null) {\n+ progressBarFrameLayout.setVisibility(View.VISIBLE);\n+ }\n+ }\nboolean addMediaPlayer(PlayerView videoSurfaceView) {\nif (!requiresMediaPlayer) {\nreturn false;\n@@ -148,8 +154,7 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nvideoSurfaceView.setLayoutParams(new FrameLayout.LayoutParams(width, height));\nframeLayout.addView(videoSurfaceView);\n- int color = Color.BLACK;\n- frameLayout.setBackgroundColor(color);\n+ frameLayout.setBackgroundColor(Color.parseColor(message.getBgColor()));\nif (progressBarFrameLayout != null) {\nprogressBarFrameLayout.setVisibility(View.VISIBLE);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"diff": "@@ -137,9 +137,9 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.ctaLinearLayout.setVisibility(View.GONE);\n}\nthis.mediaImage.setVisibility(View.GONE);\n- this.mediaImage.setBackgroundColor(Color.TRANSPARENT);\n+ this.mediaImage.setBackgroundColor(Color.parseColor(inboxMessage.getBgColor()));\nthis.squareImage.setVisibility(View.GONE);\n- this.squareImage.setBackgroundColor(Color.TRANSPARENT);\n+ this.squareImage.setBackgroundColor(Color.parseColor(inboxMessage.getBgColor()));\n//Set the height and width of Progress Bar Frame to match the thumbnail size\nfinal Resources resources = context.getResources();\nint width = resources.getDisplayMetrics().widthPixels;\n@@ -215,7 +215,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}else{\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n- this.squareImage.setBackgroundColor(Color.BLACK);\n+ //this.squareImage.setBackgroundColor(Color.BLACK);\nint drawableId = getThumbnailImage(Constants.VIDEO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.squareImage.getContext())\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": "@@ -124,6 +124,9 @@ public class MediaPlayerRecyclerView extends RecyclerView {\npublic void onPlayerStateChanged(boolean playWhenReady, int playbackState) {\nswitch (playbackState) {\ncase Player.STATE_BUFFERING:\n+ if(playingHolder != null){\n+ playingHolder.playerBuffering();;\n+ }\nbreak;\ncase Player.STATE_ENDED:\nplayer.seekTo(0);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout/inbox_icon_message_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout/inbox_icon_message_layout.xml",
"diff": "android:layout_marginBottom=\"8dp\"\nandroid:layout_marginRight=\"8dp\"\nandroid:layout_gravity=\"center\"\n- android:scaleType=\"fitCenter\"\n- android:layout_marginStart=\"20dp\" />\n+ android:scaleType=\"fitCenter\" />\n<LinearLayout\nandroid:orientation=\"vertical\"\nandroid:layout_gravity=\"center\"\nandroid:id=\"@+id/messageTitle\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- android:layout_marginLeft=\"20dp\"\n+ android:layout_marginLeft=\"10dp\"\nandroid:maxLines=\"1\"\nandroid:layout_marginTop=\"10dp\"\nandroid:layout_marginEnd=\"20dp\"\nandroid:text=\"Title\"\nandroid:textStyle=\"bold\"\nandroid:textColor=\"@android:color/black\"\n- android:layout_marginRight=\"20dp\" />\n+ android:layout_marginRight=\"20dp\"\n+ android:layout_marginStart=\"10dp\" />\n<TextView\nandroid:id=\"@+id/messageText\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:text=\"Message\"\nandroid:maxLines=\"3\"\n- android:layout_marginLeft=\"20dp\"\n+ android:layout_marginLeft=\"10dp\"\nandroid:layout_marginTop=\"5dp\"\nandroid:layout_marginRight=\"20dp\"\nandroid:textColor=\"@android:color/darker_gray\" />\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fixing inbox message UI as per dashboard preview |
116,614 | 02.02.2019 20:38:05 | 28,800 | 918c9c14370be675d643f0651a16a446cc13dfea | remove black media backgrounds, fixes to mute button display | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"diff": "@@ -180,7 +180,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n} else if(content.mediaIsAudio()){\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n- this.mediaImage.setBackgroundColor(Color.BLACK);\n+ this.mediaImage.setBackgroundColor(getImageBackgroundColor());\nint drawableId = getThumbnailImage(Constants.AUDIO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.mediaImage.getContext())\n@@ -213,7 +213,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}else{\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n- this.squareImage.setBackgroundColor(Color.BLACK);\n+ this.squareImage.setBackgroundColor(getImageBackgroundColor());\nint drawableId = getThumbnailImage(Constants.VIDEO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.squareImage.getContext())\n@@ -224,7 +224,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n} else if (content.mediaIsAudio()){\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n- this.squareImage.setBackgroundColor(Color.BLACK);\n+ this.squareImage.setBackgroundColor(getImageBackgroundColor() );\nint drawableId = getThumbnailImage(Constants.AUDIO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.squareImage.getContext())\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": "@@ -38,6 +38,7 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nContext context;\nImageView mediaImage,squareImage;\nFrameLayout progressBarFrameLayout;\n+ private ImageView muteIcon;\nprivate WeakReference<CTInboxListViewFragment> parentWeakReference;\n@@ -109,6 +110,10 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nreturn frameLayout;\n}\n+ int getImageBackgroundColor() {\n+ return Color.TRANSPARENT;\n+ }\n+\nboolean needsMediaPlayer () {\nreturn requiresMediaPlayer;\n}\n@@ -120,6 +125,9 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nvoid playerReady() {\nFrameLayout frameLayout = getLayoutForMediaPlayer();\nframeLayout.setVisibility(View.VISIBLE);\n+ if (muteIcon != null) {\n+ muteIcon.setVisibility(View.VISIBLE);\n+ }\nif (progressBarFrameLayout != null) {\nprogressBarFrameLayout.setVisibility(View.GONE);\n}\n@@ -129,6 +137,13 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nif (progressBarFrameLayout != null) {\nprogressBarFrameLayout.setVisibility(View.GONE);\n}\n+ if (muteIcon != null) {\n+ muteIcon.setVisibility(View.GONE);\n+ }\n+ FrameLayout frameLayout = getLayoutForMediaPlayer();\n+ if (frameLayout != null) {\n+ frameLayout.removeAllViews();\n+ }\n}\nvoid playerBuffering(){\n@@ -163,7 +178,8 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nfinal SimpleExoPlayer player = (SimpleExoPlayer) videoSurfaceView.getPlayer();\nfloat currentVolume = player.getVolume();\nif (firstContentItem.mediaIsVideo()) {\n- final ImageView muteIcon = new ImageView(context);\n+ muteIcon = new ImageView(context);\n+ muteIcon.setVisibility(View.GONE);\nif (currentVolume > 0) {\nmuteIcon.setImageDrawable(context.getResources().getDrawable(R.drawable.volume_on));\n} else {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"diff": "@@ -182,7 +182,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}else if(content.mediaIsAudio()){\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n- this.mediaImage.setBackgroundColor(Color.BLACK);\n+ this.mediaImage.setBackgroundColor(getImageBackgroundColor());\nint drawableId = getThumbnailImage(Constants.AUDIO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.mediaImage.getContext())\n@@ -215,7 +215,6 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}else{\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n- //this.squareImage.setBackgroundColor(Color.BLACK);\nint drawableId = getThumbnailImage(Constants.VIDEO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.squareImage.getContext())\n@@ -226,7 +225,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}else if(content.mediaIsAudio()){\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n- this.squareImage.setBackgroundColor(Color.BLACK);\n+ this.squareImage.setBackgroundColor(getImageBackgroundColor());\nint drawableId = getThumbnailImage(Constants.AUDIO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.squareImage.getContext())\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": "@@ -104,7 +104,7 @@ public class Constants {\nstatic final String COPY_TYPE = \"copy\";\nstatic final String DND_START = \"22:00\";\nstatic final String DND_STOP = \"06:00\";\n- static final String VIDEO_THUMBNAIL = \"thumbnail\";\n+ static final String VIDEO_THUMBNAIL = \"ct_audio\"; // TODO swap in a transparent background video placeholder image\nstatic final String AUDIO_THUMBNAIL = \"ct_audio\";\n/**\n* Profile command constants.\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | remove black media backgrounds, fixes to mute button display |
116,623 | 04.02.2019 20:54:38 | -19,080 | 1920dfd01469ba7fdf57275e6a751cac4060c248 | Added placeholder images and landscape mode changes | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTCarouselViewPagerAdapter.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTCarouselViewPagerAdapter.java",
"diff": "@@ -10,6 +10,7 @@ import android.widget.ImageView;\nimport android.widget.LinearLayout;\nimport com.bumptech.glide.Glide;\n+import com.bumptech.glide.request.RequestOptions;\nimport java.lang.ref.WeakReference;\nimport java.util.ArrayList;\n@@ -63,6 +64,9 @@ public class CTCarouselViewPagerAdapter extends PagerAdapter {\nimageView.setVisibility(View.VISIBLE);\nGlide.with(imageView.getContext())\n.load(carouselImages.get(position))\n+ .apply(new RequestOptions()\n+ .placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n+ .error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(imageView);\ncontainer.addView(view, layoutParams);\nview.setOnClickListener(new View.OnClickListener() {\n@@ -79,6 +83,9 @@ public class CTCarouselViewPagerAdapter extends PagerAdapter {\nimageView.setVisibility(View.VISIBLE);\nGlide.with(imageView.getContext())\n.load(carouselImages.get(position))\n+ .apply(new RequestOptions()\n+ .placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n+ .error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(imageView);\ncontainer.addView(view, layoutParams);\nview.setOnClickListener(new View.OnClickListener() {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"diff": "package com.clevertap.android.sdk;\nimport android.app.Activity;\n+import android.content.res.Configuration;\nimport android.content.res.Resources;\nimport android.graphics.Color;\nimport android.os.Handler;\nimport android.support.annotation.NonNull;\n+import android.util.TypedValue;\nimport android.view.View;\nimport android.widget.Button;\nimport android.widget.ImageView;\n@@ -13,6 +15,7 @@ import android.widget.RelativeLayout;\nimport android.widget.TextView;\nimport com.bumptech.glide.Glide;\n+import com.bumptech.glide.request.RequestOptions;\nimport org.json.JSONArray;\nimport org.json.JSONException;\n@@ -140,7 +143,12 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.squareImage.setBackgroundColor(Color.parseColor(inboxMessage.getBgColor()));\n//Set the height and width of Progress Bar Frame to match the thumbnail size\nfinal Resources resources = context.getResources();\n- int width = resources.getDisplayMetrics().widthPixels;\n+ int width;\n+ if(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE) {\n+ width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, Constants.LIST_VIEW_WIDTH, resources.getDisplayMetrics());\n+ }else {\n+ width = resources.getDisplayMetrics().widthPixels;\n+ }\nint height = inboxMessage.getOrientation().equalsIgnoreCase(\"l\") ? Math.round(width * 0.5625f) : width;\nthis.progressBarFrameLayout.setLayoutParams(new RelativeLayout.LayoutParams(width, height));\nthis.progressBarFrameLayout.setVisibility(View.GONE);\n@@ -152,6 +160,9 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\nGlide.with(this.mediaImage.getContext())\n.load(content.getMedia())\n+ .apply(new RequestOptions()\n+ .placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n+ .error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(this.mediaImage);\n} else if (content.mediaIsGIF()) {\nthis.mediaImage.setVisibility(View.VISIBLE);\n@@ -159,6 +170,9 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nGlide.with(this.mediaImage.getContext())\n.asGif()\n.load(content.getMedia())\n+ .apply(new RequestOptions()\n+ .placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n+ .error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(this.mediaImage);\n} else if (content.mediaIsVideo()) {\nif(!content.getPosterUrl().isEmpty()) {\n@@ -166,11 +180,14 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\nGlide.with(this.mediaImage.getContext())\n.load(content.getPosterUrl())\n+ .apply(new RequestOptions()\n+ .placeholder(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL))\n+ .error(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL)))\n.into(this.mediaImage);\n}else{\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n- int drawableId = getThumbnailImage(Constants.VIDEO_THUMBNAIL);\n+ int drawableId = Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.mediaImage.getContext())\n.load(drawableId)\n@@ -181,7 +198,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\nthis.mediaImage.setBackgroundColor(getImageBackgroundColor());\n- int drawableId = getThumbnailImage(Constants.AUDIO_THUMBNAIL);\n+ int drawableId = Utils.getThumbnailImage(context,Constants.AUDIO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.mediaImage.getContext())\n.load(drawableId)\n@@ -195,6 +212,9 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.squareImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\nGlide.with(this.squareImage.getContext())\n.load(content.getMedia())\n+ .apply(new RequestOptions()\n+ .placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n+ .error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(this.squareImage);\n} else if (content.mediaIsGIF()) {\nthis.squareImage.setVisibility(View.VISIBLE);\n@@ -202,6 +222,9 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nGlide.with(this.squareImage.getContext())\n.asGif()\n.load(content.getMedia())\n+ .apply(new RequestOptions()\n+ .placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n+ .error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(this.squareImage);\n} else if (content.mediaIsVideo()) {\nif(!content.getPosterUrl().isEmpty()) {\n@@ -209,12 +232,15 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nGlide.with(this.squareImage.getContext())\n.load(content.getPosterUrl())\n+ .apply(new RequestOptions()\n+ .placeholder(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL))\n+ .error(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL)))\n.into(this.squareImage);\n}else{\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nthis.squareImage.setBackgroundColor(getImageBackgroundColor());\n- int drawableId = getThumbnailImage(Constants.VIDEO_THUMBNAIL);\n+ int drawableId = Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.squareImage.getContext())\n.load(drawableId)\n@@ -225,7 +251,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nthis.squareImage.setBackgroundColor(getImageBackgroundColor() );\n- int drawableId = getThumbnailImage(Constants.AUDIO_THUMBNAIL);\n+ int drawableId = Utils.getThumbnailImage(context,Constants.AUDIO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.squareImage.getContext())\n.load(drawableId)\n@@ -264,6 +290,9 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\niconImage.setVisibility(View.VISIBLE);\nGlide.with(iconImage.getContext())\n.load(content.getIcon())\n+ .apply(new RequestOptions()\n+ .placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n+ .error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(iconImage);\n} else {\niconImage.setVisibility(View.GONE);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxActivity.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxActivity.java",
"diff": "@@ -28,7 +28,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nTabLayout tabLayout;\nViewPager viewPager;\nCTInboxStyleConfig styleConfig;\n-\n+ static int orientation;\ninterface InboxActivityListener{\nvoid messageDidShow(CTInboxActivity ctInboxActivity, CTInboxMessage inboxMessage, Bundle data);\nvoid messageDidClick(CTInboxActivity ctInboxActivity, CTInboxMessage inboxMessage, Bundle data);\n@@ -69,6 +69,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nif (cleverTapAPI != null) {\nsetListener(cleverTapAPI);\n}\n+ orientation = getResources().getConfiguration().orientation;\n}catch (Throwable t){\nLogger.v(\"Cannot find a valid notification inbox bundle to show!\", t);\nreturn;\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": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk;\nimport android.annotation.SuppressLint;\nimport android.content.Context;\n+import android.content.res.Configuration;\nimport android.content.res.Resources;\nimport android.graphics.Color;\nimport android.net.Uri;\n@@ -164,7 +165,14 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nfinal Resources resources = context.getResources();\nfinal DisplayMetrics displayMetrics = resources.getDisplayMetrics();\n- int width = resources.getDisplayMetrics().widthPixels;\n+\n+ int width;\n+ if(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE) {\n+ width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, Constants.LIST_VIEW_WIDTH, resources.getDisplayMetrics());\n+ }else {\n+ width = resources.getDisplayMetrics().widthPixels;\n+ }\n+\nint height = message.getOrientation().equalsIgnoreCase(\"l\") ? Math.round(width * 0.5625f) : width;\nvideoSurfaceView.setLayoutParams(new FrameLayout.LayoutParams(width, height));\n@@ -231,11 +239,4 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\n}\nreturn true;\n}\n- int getThumbnailImage(String image){\n- if (context != null) {\n- return context.getResources().getIdentifier(image,\"drawable\",context.getPackageName());\n- } else {\n- return -1;\n- }\n- }\n}\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.res.Configuration;\nimport android.graphics.Color;\nimport android.net.Uri;\nimport android.os.Bundle;\n@@ -14,6 +15,8 @@ import android.support.v4.app.Fragment;\nimport android.support.v7.widget.DefaultItemAnimator;\nimport android.support.v7.widget.LinearLayoutManager;\nimport android.support.v7.widget.RecyclerView;\n+import android.util.TypedValue;\n+import android.view.Gravity;\nimport android.view.LayoutInflater;\nimport android.view.View;\nimport android.view.ViewGroup;\n@@ -119,6 +122,13 @@ public class CTInboxListViewFragment extends Fragment {\nfinal LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity());\nfinal CTInboxMessageAdapter inboxMessageAdapter = new CTInboxMessageAdapter(inboxMessages, this);\n+ if(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE){\n+ int width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, Constants.LIST_VIEW_WIDTH, getResources().getDisplayMetrics());\n+ LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(width, ViewGroup.LayoutParams.MATCH_PARENT);\n+ layoutParams.gravity = Gravity.CENTER;\n+ linearLayout.setLayoutParams(layoutParams);\n+ }\n+\nif (haveVideoPlayerSupport) {\nmediaRecyclerView = new MediaPlayerRecyclerView(getActivity());\nsetMediaRecyclerView(mediaRecyclerView);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"diff": "package com.clevertap.android.sdk;\nimport android.app.Activity;\n+import android.content.res.Configuration;\nimport android.content.res.Resources;\nimport android.graphics.Color;\nimport android.os.Handler;\nimport android.support.annotation.NonNull;\n+import android.util.TypedValue;\nimport android.view.View;\nimport android.widget.Button;\nimport android.widget.ImageView;\n@@ -12,6 +14,7 @@ import android.widget.RelativeLayout;\nimport android.widget.TextView;\nimport com.bumptech.glide.Glide;\n+import com.bumptech.glide.request.RequestOptions;\nimport org.json.JSONArray;\nimport org.json.JSONException;\n@@ -142,7 +145,12 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.squareImage.setBackgroundColor(Color.parseColor(inboxMessage.getBgColor()));\n//Set the height and width of Progress Bar Frame to match the thumbnail size\nfinal Resources resources = context.getResources();\n- int width = resources.getDisplayMetrics().widthPixels;\n+ int width;\n+ if(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE) {\n+ width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, Constants.LIST_VIEW_WIDTH, resources.getDisplayMetrics());\n+ }else {\n+ width = resources.getDisplayMetrics().widthPixels;\n+ }\nint height = inboxMessage.getOrientation().equalsIgnoreCase(\"l\") ? Math.round(width * 0.5625f) : width;\nthis.progressBarFrameLayout.setLayoutParams(new RelativeLayout.LayoutParams(width, height));\nthis.progressBarFrameLayout.setVisibility(View.GONE);\n@@ -154,6 +162,9 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\nGlide.with(this.mediaImage.getContext())\n.load(content.getMedia())\n+ .apply(new RequestOptions()\n+ .placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n+ .error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(this.mediaImage);\n} else if (content.mediaIsGIF()) {\nthis.mediaImage.setVisibility(View.VISIBLE);\n@@ -161,6 +172,9 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nGlide.with(this.mediaImage.getContext())\n.asGif()\n.load(content.getMedia())\n+ .apply(new RequestOptions()\n+ .placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n+ .error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(this.mediaImage);\n} else if (content.mediaIsVideo()) {\nif(!content.getPosterUrl().isEmpty()) {\n@@ -168,11 +182,14 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\nGlide.with(this.mediaImage.getContext())\n.load(content.getPosterUrl())\n+ .apply(new RequestOptions()\n+ .placeholder(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL))\n+ .error(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL)))\n.into(this.mediaImage);\n} else {\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n- int drawableId = getThumbnailImage(Constants.VIDEO_THUMBNAIL);\n+ int drawableId = Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.mediaImage.getContext())\n.load(drawableId)\n@@ -183,7 +200,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\nthis.mediaImage.setBackgroundColor(getImageBackgroundColor());\n- int drawableId = getThumbnailImage(Constants.AUDIO_THUMBNAIL);\n+ int drawableId = Utils.getThumbnailImage(context,Constants.AUDIO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.mediaImage.getContext())\n.load(drawableId)\n@@ -197,6 +214,9 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.squareImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\nGlide.with(this.squareImage.getContext())\n.load(content.getMedia())\n+ .apply(new RequestOptions()\n+ .placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n+ .error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(this.squareImage);\n} else if (content.mediaIsGIF()) {\nthis.squareImage.setVisibility(View.VISIBLE);\n@@ -204,6 +224,9 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nGlide.with(this.squareImage.getContext())\n.asGif()\n.load(content.getMedia())\n+ .apply(new RequestOptions()\n+ .placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n+ .error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(this.squareImage);\n} else if (content.mediaIsVideo()) {\nif(!content.getPosterUrl().isEmpty()) {\n@@ -211,11 +234,14 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nGlide.with(this.squareImage.getContext())\n.load(content.getPosterUrl())\n+ .apply(new RequestOptions()\n+ .placeholder(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL))\n+ .error(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL)))\n.into(this.squareImage);\n}else{\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n- int drawableId = getThumbnailImage(Constants.VIDEO_THUMBNAIL);\n+ int drawableId = Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.squareImage.getContext())\n.load(drawableId)\n@@ -226,7 +252,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nthis.squareImage.setBackgroundColor(getImageBackgroundColor());\n- int drawableId = getThumbnailImage(Constants.AUDIO_THUMBNAIL);\n+ int drawableId = Utils.getThumbnailImage(context,Constants.AUDIO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.squareImage.getContext())\n.load(drawableId)\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": "@@ -104,8 +104,10 @@ public class Constants {\nstatic final String COPY_TYPE = \"copy\";\nstatic final String DND_START = \"22:00\";\nstatic final String DND_STOP = \"06:00\";\n- static final String VIDEO_THUMBNAIL = \"ct_audio\"; // TODO swap in a transparent background video placeholder image\n+ static final String VIDEO_THUMBNAIL = \"ct_video_1\";\nstatic final String AUDIO_THUMBNAIL = \"ct_audio\";\n+ static final String IMAGE_PLACEHOLDER = \"ct_image\";\n+ static final int LIST_VIEW_WIDTH = 450;\n/**\n* Profile command constants.\n*/\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": "@@ -125,7 +125,7 @@ public class MediaPlayerRecyclerView extends RecyclerView {\nswitch (playbackState) {\ncase Player.STATE_BUFFERING:\nif(playingHolder != null){\n- playingHolder.playerBuffering();;\n+ playingHolder.playerBuffering();\n}\nbreak;\ncase Player.STATE_ENDED:\n@@ -178,6 +178,7 @@ public class MediaPlayerRecyclerView extends RecyclerView {\ncontinue;\n}\nCTInboxBaseMessageViewHolder holder = (CTInboxBaseMessageViewHolder) child.getTag();\n+ if(holder != null) {\nif (!holder.needsMediaPlayer()) {\ncontinue;\n}\n@@ -189,6 +190,7 @@ public class MediaPlayerRecyclerView extends RecyclerView {\nbestHolder = holder;\n}\n}\n+ }\nreturn bestHolder;\n}\npublic void playVideo() {\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": "@@ -211,4 +211,12 @@ final class Utils {\n}\n}\n}\n+\n+ static int getThumbnailImage(Context context, String image){\n+ if (context != null) {\n+ return context.getResources().getIdentifier(image,\"drawable\",context.getPackageName());\n+ } else {\n+ return -1;\n+ }\n+ }\n}\n"
},
{
"change_type": "ADD",
"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 /dev/null and b/clevertap-android-sdk/src/main/res/drawable/ct_image.png differ\n"
},
{
"change_type": "ADD",
"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 /dev/null and b/clevertap-android-sdk/src/main/res/drawable/ct_video_1.png differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout/inbox_list_view.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout/inbox_list_view.xml",
"diff": "android:orientation=\"vertical\"\nandroid:id=\"@+id/list_view_linear_layout\">\n<android.support.v7.widget.RecyclerView\n- android:layout_width=\"match_parent\"\n- android:layout_height=\"match_parent\"\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\nandroid:paddingTop=\"10dp\"\nandroid:id=\"@+id/list_view_recycler_view\"\nandroid:visibility=\"gone\"/>\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Added placeholder images and landscape mode changes |
116,614 | 04.02.2019 11:13:49 | 28,800 | 2e10fba0277de80a9f0283653811a868b5845438 | pause player at end | [
{
"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": "@@ -129,7 +129,13 @@ public class MediaPlayerRecyclerView extends RecyclerView {\n}\nbreak;\ncase Player.STATE_ENDED:\n+ if (player != null) {\nplayer.seekTo(0);\n+ player.setPlayWhenReady(false);\n+ if (videoSurfaceView != null) {\n+ videoSurfaceView.showController();\n+ }\n+ }\nbreak;\ncase Player.STATE_IDLE:\nbreak;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | pause player at end |
116,623 | 05.02.2019 15:44:07 | -19,080 | d198c5b376241e0060fb8cda5e603e12faa6c8e3 | Fixed GIF sizing and removed normal recycler view padding | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"diff": "@@ -166,7 +166,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.into(this.mediaImage);\n} else if (content.mediaIsGIF()) {\nthis.mediaImage.setVisibility(View.VISIBLE);\n- this.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ this.mediaImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nGlide.with(this.mediaImage.getContext())\n.asGif()\n.load(content.getMedia())\n@@ -218,7 +218,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.into(this.squareImage);\n} else if (content.mediaIsGIF()) {\nthis.squareImage.setVisibility(View.VISIBLE);\n- this.squareImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ this.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nGlide.with(this.squareImage.getContext())\n.asGif()\n.load(content.getMedia())\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"diff": "@@ -168,7 +168,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.into(this.mediaImage);\n} else if (content.mediaIsGIF()) {\nthis.mediaImage.setVisibility(View.VISIBLE);\n- this.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ this.mediaImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nGlide.with(this.mediaImage.getContext())\n.asGif()\n.load(content.getMedia())\n@@ -220,7 +220,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.into(this.squareImage);\n} else if (content.mediaIsGIF()) {\nthis.squareImage.setVisibility(View.VISIBLE);\n- this.squareImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ this.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nGlide.with(this.squareImage.getContext())\n.asGif()\n.load(content.getMedia())\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout/inbox_list_view.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout/inbox_list_view.xml",
"diff": "<android.support.v7.widget.RecyclerView\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\n- android:paddingTop=\"10dp\"\nandroid:id=\"@+id/list_view_recycler_view\"\nandroid:visibility=\"gone\"/>\n<TextView\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fixed GIF sizing and removed normal recycler view padding |
116,614 | 05.02.2019 19:50:51 | 28,800 | a36e9500275fe4c31d53e7fbe39f5471b24ecba0 | tweak inbox init 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": "@@ -6090,8 +6090,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// always call async\nprivate void _processInboxMessages(JSONArray messages) {\n- _initializeInbox();\nsynchronized (inboxControllerLock) {\n+ if (this.ctInboxController == null) {\n+ _initializeInbox();\n+ }\nif (this.ctInboxController != null) {\nboolean update = this.ctInboxController.updateMessages(messages);\nif (update) {\n@@ -6105,6 +6107,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate void _initializeInbox() {\nsynchronized (inboxControllerLock) {\nif (this.ctInboxController != null) {\n+ _notifyInboxInitialized();\nreturn;\n}\nthis.ctInboxController = new CTInboxController(getCleverTapID(), loadDBAdapter(context), haveVideoPlayerSupport);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | tweak inbox init callback |
116,623 | 06.02.2019 14:33:46 | -19,080 | e44f1358011b51f6ba0a4c7e8681e43f1c479ec8 | Fixes Carousel dots and placeholder image scaletype | [
{
"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.4.1'\n+ libraryVersion = '3.4.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.4.1.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.4.2.0\"'\n}\nrelease {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.4.1.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.4.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=\"30401\"\n- android:versionName=\"3.4.1\">\n+ android:versionCode=\"30402\"\n+ android:versionName=\"3.4.2\">\n<application>\n<receiver\nandroid:name=\"com.clevertap.android.sdk.InstallReferrerBroadcastReceiver\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTCarouselMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTCarouselMessageViewHolder.java",
"diff": "@@ -86,7 +86,11 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\nCTCarouselViewPagerAdapter carouselViewPagerAdapter = new CTCarouselViewPagerAdapter(appContext, parent, inboxMessage,layoutParams,position);\nthis.imageViewPager.setAdapter(carouselViewPagerAdapter);\n//Adds the dots for the carousel\n- int dotsCount = carouselViewPagerAdapter.getCount();\n+ //int dotsCount = carouselViewPagerAdapter.getCount();\n+ int dotsCount = inboxMessage.getInboxMessageContents().size();\n+ if(this.sliderDots.getChildCount()>0){\n+ this.sliderDots.removeAllViews();\n+ }\nImageView[] dots = new ImageView[dotsCount];\nfor(int k=0;k<dotsCount;k++){\ndots[k] = new ImageView(parent.getActivity());\n@@ -151,6 +155,7 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.viewHolder = viewHolder;\nthis.dots = dots;\nthis.inboxMessage = inboxMessage;\n+ this.dots[0].setImageDrawable(context.getResources().getDrawable(R.drawable.selected_dot));\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout/inbox_carousel_image_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout/inbox_carousel_image_layout.xml",
"diff": "<com.clevertap.android.sdk.RectangleImageView\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- android:scaleType=\"fitXY\"\n+ android:scaleType=\"centerCrop\"\nandroid:src=\"@drawable/ct_audio\"\nandroid:visibility=\"gone\"\nandroid:adjustViewBounds=\"true\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:src=\"@drawable/ct_audio\"\n- android:scaleType=\"fitXY\"\n+ android:scaleType=\"centerCrop\"\nandroid:visibility=\"gone\"/>\n</LinearLayout>\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fixes Carousel dots and placeholder image scaletype |
116,623 | 06.02.2019 14:49:39 | -19,080 | 6cc25bc4b6acb2d89e44c2a3450c6315f40c3f69 | Preparing for release v3.4.2 | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/build.gradle",
"new_path": "AndroidStarter/app/build.gradle",
"diff": "@@ -29,7 +29,7 @@ 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.4.1', ext: 'aar') //CleverTap Android SDK, make sure the AAR file is in the libs folder\n+ implementation (name: 'clevertap-android-sdk-3.4.2', ext: 'aar') //CleverTap Android SDK, make sure the AAR file is in the libs folder\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.4.1.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.4.1.aar",
"diff": "Binary files a/AndroidStarter/app/libs/clevertap-android-sdk-3.4.1.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.4.2.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.4.2.aar",
"diff": "Binary files /dev/null and b/AndroidStarter/app/libs/clevertap-android-sdk-3.4.2.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/build.gradle",
"new_path": "AndroidStarter/build.gradle",
"diff": "@@ -5,8 +5,12 @@ buildscript {\nrepositories {\ngoogle()\njcenter()\n+ maven {\n+ url \"http://storage.googleapis.com/r8-releases/raw\" // ADD THIS TO FIX ISSUE #15\n+ }\n}\ndependencies {\n+ classpath 'com.android.tools:r8:1.3.52' // ADD THIS TO FIX ISSUE #15\nclasspath 'com.android.tools.build:gradle:3.3.0'\nclasspath 'com.google.gms:google-services:4.0.0'//Needed for FCM\n"
},
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n+### Version 3.4.2 (February 6, 2019)\n+* Improved callback support for App Inbox\n+* Fixed Carousel dots rendering issue\n+\n### Version 3.4.1 (February 5, 2019)\n* Adds support for Landscape mode in custom HTML InApps and App Inbox\n* Performance improvements for App Inbox\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.4.1'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.4.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.4.1', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.4.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.4.1'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.4.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.4.1.aar",
"new_path": "clevertap-android-sdk-3.4.1.aar",
"diff": "Binary files a/clevertap-android-sdk-3.4.1.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "clevertap-android-sdk-3.4.2.aar",
"new_path": "clevertap-android-sdk-3.4.2.aar",
"diff": "Binary files /dev/null and b/clevertap-android-sdk-3.4.2.aar differ\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Preparing for release v3.4.2 |
116,623 | 02.03.2019 17:00:23 | -19,080 | 29759fc3a034593cf97b68469153f8cb6ff3153a | Adding default instance with custom id feature and little refactoring | [
{
"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": "@@ -56,8 +56,8 @@ public abstract class CTInAppBaseFragment extends Fragment {\nsuper.onAttach(activity);\nparent = activity;\nBundle bundle = getArguments();\n- inAppNotification = bundle.getParcelable(\"inApp\");\n- config = bundle.getParcelable(\"config\");\n+ inAppNotification = bundle.getParcelable(Constants.INAPP_KEY);\n+ config = bundle.getParcelable(Constants.KEY_CONFIG);\ngenerateListener();\n}\n@@ -111,7 +111,7 @@ public abstract class CTInAppBaseFragment extends Fragment {\nBundle data = new Bundle();\ndata.putString(Constants.NOTIFICATION_ID_TAG,inAppNotification.getCampaignId());\n- data.putString(\"wzrk_c2a\", button.getText());\n+ data.putString(Constants.KEY_C2A, button.getText());\ndidClick(data);\nString actionUrl = button.getActionUrl();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullHtmlFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullHtmlFragment.java",
"diff": "@@ -108,13 +108,13 @@ public abstract class CTInAppBaseFullHtmlFragment extends CTInAppBaseFullFragmen\ntry {\nformData = UriHelper.getAllKeyValuePairs(url, false);\n- if (formData != null && formData.containsKey(\"wzrk_c2a\")) {\n- final String c2a = formData.getString(\"wzrk_c2a\");\n+ if (formData != null && formData.containsKey(Constants.KEY_C2A)) {\n+ final String c2a = formData.getString(Constants.KEY_C2A);\nif (c2a != null) {\nfinal String[] parts = c2a.split(\"__dl__\");\nif (parts.length == 2) {\n// Decode it here as wzrk_c2a is not decoded by UriHelper\n- formData.putString(\"wzrk_c2a\", URLDecoder.decode(parts[0], \"UTF-8\"));\n+ formData.putString(Constants.KEY_C2A, URLDecoder.decode(parts[0], \"UTF-8\"));\nurl = parts[1];\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBasePartialHtmlFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBasePartialHtmlFragment.java",
"diff": "@@ -71,8 +71,8 @@ public abstract class CTInAppBasePartialHtmlFragment extends CTInAppBasePartialF\ntry {\nformData = UriHelper.getAllKeyValuePairs(url, false);\n- if (formData != null && formData.containsKey(\"wzrk_c2a\")) {\n- final String c2a = formData.getString(\"wzrk_c2a\");\n+ if (formData != null && formData.containsKey(Constants.KEY_C2A)) {\n+ final String c2a = formData.getString(Constants.KEY_C2A);\nif (c2a != null) {\nfinal String[] parts = c2a.split(\"__dl__\");\nif (parts.length == 2) {\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": "@@ -478,28 +478,34 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* Returns the default shared instance of the CleverTap SDK.\n*\n* @param context The Android context\n+ * @param cleverTapID Custom CleverTapID passed by the app\n* @return The {@link CleverTapAPI} object\n*/\n@SuppressWarnings(\"WeakerAccess\")\n- public static @Nullable CleverTapAPI getDefaultInstance(Context context) {\n+ public static CleverTapAPI getDefaultInstance(Context context, String cleverTapID){\n// For Google Play Store/Android Studio tracking\nsdkVersion = BuildConfig.SDK_VERSION_STRING;\n- if (defaultConfig == null) {\n- ManifestInfo manifest = ManifestInfo.getInstance(context);\n- String accountId = manifest.getAccountId();\n- String accountToken = manifest.getAcountToken();\n- String accountRegion = manifest.getAccountRegion();\n- if(accountId == null || accountToken == null) {\n- Logger.i(\"Account ID or Account token is missing from AndroidManifest.xml, unable to create default instance\");\n+ if(defaultConfig != null){\n+ return instanceWithConfig(context,defaultConfig);\n+ }else {\n+ defaultConfig = getDefaultConfig(context,cleverTapID);\n+ if(defaultConfig != null){\n+ return instanceWithConfig(context,defaultConfig);\n+ }else {\nreturn null;\n}\n- if (accountRegion == null) {\n- Logger.i(\"Account Region not specified in the AndroidManifest - using default region\");\n}\n- defaultConfig = CleverTapInstanceConfig.createDefaultInstance(context, accountId, accountToken, accountRegion);\n- defaultConfig.setDebugLevel(getDebugLevel());\n}\n- return instanceWithConfig(context, defaultConfig);\n+\n+ /**\n+ * Returns the default shared instance of the CleverTap SDK.\n+ *\n+ * @param context The Android context\n+ * @return The {@link CleverTapAPI} object\n+ */\n+ @SuppressWarnings(\"WeakerAccess\")\n+ public static @Nullable CleverTapAPI getDefaultInstance(Context context) {\n+ return getDefaultInstance(context,null);\n}\n/**\n@@ -527,6 +533,43 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn instance;\n}\n+ /**\n+ * Creates default {@link CleverTapInstanceConfig} object and returns it\n+ *\n+ * @param context The Android context\n+ * @param cleverTapID Custom CleverTapID passed by the app\n+ * @return The {@link CleverTapInstanceConfig} object\n+ */\n+ private static CleverTapInstanceConfig getDefaultConfig(Context context, String cleverTapID){\n+ ManifestInfo manifest = ManifestInfo.getInstance(context);\n+ String accountId = manifest.getAccountId();\n+ String accountToken = manifest.getAcountToken();\n+ String accountRegion = manifest.getAccountRegion();\n+ String useCustomIdValue = manifest.useCustomId();\n+ if(accountId == null || accountToken == null) {\n+ Logger.i(\"Account ID or Account token is missing from AndroidManifest.xml, unable to create default instance\");\n+ return null;\n+ }\n+ if (accountRegion == null) {\n+ Logger.i(\"Account Region not specified in the AndroidManifest - using default region\");\n+ }\n+\n+ if(useCustomIdValue != null){\n+ if(cleverTapID == null){\n+ Logger.i(\"CleverTap SDK has been directed to use custom CleverTap ID but custom ID passed is NULL. Please provide a valid custom ID.\");\n+ return null;\n+ }\n+ if(cleverTapID.isEmpty()){\n+ Logger.i(\"CleverTap SDK has been directed to use custom CleverTap ID but custom ID passed is empty. Please provide a valid custom ID.\");\n+ return null;\n+ }\n+\n+ return CleverTapInstanceConfig.createDefaultInstance(context,accountId,accountToken,accountRegion,cleverTapID);\n+ }else {\n+ return CleverTapInstanceConfig.createDefaultInstance(context,accountId,accountToken,accountRegion);\n+ }\n+ }\n+\n//Lifecycle\nprivate void activityPaused() {\nsetAppForeground(false);\n@@ -2432,7 +2475,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nSharedPreferences prefs = StorageHelper.getPreferences(context);\nSharedPreferences.Editor editor = prefs.edit();\ntry {\n- JSONArray inappsFromPrefs = new JSONArray(getStringFromPrefs(Constants.PREFS_INAPP_KEY, \"[]\"));\n+ JSONArray inappsFromPrefs = new JSONArray(getStringFromPrefs(Constants.INAPP_KEY, \"[]\"));\n// Now add the rest of them :)\nif (inappNotifs != null && inappNotifs.length() > 0) {\n@@ -2447,7 +2490,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n// Commit all the changes\n- editor.putString(storageKeyWithSuffix(Constants.PREFS_INAPP_KEY), inappsFromPrefs.toString());\n+ editor.putString(storageKeyWithSuffix(Constants.INAPP_KEY), inappsFromPrefs.toString());\nStorageHelper.persist(editor);\n} catch (Throwable e) {\ngetConfigLogger().verbose(getAccountId(),\"InApp: Failed to parse the in-app notifications properly\");\n@@ -2489,7 +2532,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ncheckPendingNotifications(context, config); // see if we have any pending notifications\n- JSONArray inapps = new JSONArray(getStringFromPrefs(Constants.PREFS_INAPP_KEY, \"[]\"));\n+ JSONArray inapps = new JSONArray(getStringFromPrefs(Constants.INAPP_KEY, \"[]\"));\nif (inapps.length() < 1) {\nreturn;\n}\n@@ -2504,7 +2547,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (i==0) continue;\ninappsUpdated.put(inapps.get(i));\n}\n- SharedPreferences.Editor editor = prefs.edit().putString(storageKeyWithSuffix(Constants.PREFS_INAPP_KEY), inappsUpdated.toString());\n+ SharedPreferences.Editor editor = prefs.edit().putString(storageKeyWithSuffix(Constants.INAPP_KEY), inappsUpdated.toString());\nStorageHelper.persist(editor);\n} catch (Throwable t) {\n// We won't get here\n@@ -4608,9 +4651,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* In addition, any global frequency caps are reset as part of the switch.\n*\n* @param profile The map keyed by the type of identity, with the value as the identity\n+ * @param cleverTapID Custom CleverTap ID passed by the App\n*/\n@SuppressWarnings(\"unused\")\n- public void onUserLogin(final Map<String, Object> profile) {\n+ public void onUserLogin(final Map<String, Object> profile, final String cleverTapID) {\nif (profile == null) return;\ntry {\n@@ -4699,7 +4743,13 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n_deviceInfo.forceUpdateDeviceId(guid);\nnotifyUserProfileInitialized(guid);\n} else {\n- String g = _deviceInfo.forceNewDeviceID();\n+ String g;\n+ if(cleverTapID == null) {\n+ g = _deviceInfo.forceNewDeviceID();\n+ }else{\n+ getConfigLogger().info(getAccountId(),\"Updating CleverTapID to given custom ID : \"+config.getCustomId());\n+ g = _deviceInfo.forceUpdateDeviceId(cleverTapID);\n+ }\nnotifyUserProfileInitialized(g);\n}\nsetCurrentUserOptOutStateFromStorage(); // be sure to call this after the guid is updated\n@@ -4721,6 +4771,40 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n+ /**\n+ * Creates a separate and distinct user profile identified by one or more of Identity,\n+ * Email, FBID or GPID values,\n+ * and populated with the key-values included in the profile map argument.\n+ * <p>\n+ * If your app is used by multiple users, you can use this method to assign them each a\n+ * unique profile to track them separately.\n+ * <p>\n+ * If instead you wish to assign multiple Identity, Email, FBID and/or GPID values to the same\n+ * user profile,\n+ * use profile.push rather than this method.\n+ * <p>\n+ * If none of Identity, Email, FBID or GPID is included in the profile map,\n+ * all profile map values will be associated with the current user profile.\n+ * <p>\n+ * When initially installed on this device, your app is assigned an \"anonymous\" profile.\n+ * The first time you identify a user on this device (whether via onUserLogin or profilePush),\n+ * the \"anonymous\" history on the device will be associated with the newly identified user.\n+ * <p>\n+ * Then, use this method to switch between subsequent separate identified users.\n+ * <p>\n+ * Please note that switching from one identified user to another is a costly operation\n+ * in that the current session for the previous user is automatically closed\n+ * and data relating to the old user removed, and a new session is started\n+ * for the new user and data for that user refreshed via a network call to CleverTap.\n+ * In addition, any global frequency caps are reset as part of the switch.\n+ *\n+ * @param profile The map keyed by the type of identity, with the value as the identity\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void onUserLogin(final Map<String, Object> profile) {\n+ onUserLogin(profile,null);\n+ }\n+\nprivate String getGUIDForIdentifier(String key, String identifier) {\nif (key == null || identifier == null) return null;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"diff": "@@ -23,8 +23,9 @@ public class CleverTapInstanceConfig implements Parcelable {\nprivate boolean createdPostAppLaunch;\nprivate boolean sslPinning;\nprivate boolean backgroundSync;\n+ private String customId;\n- private CleverTapInstanceConfig(Context context, String accountId, String accountToken, String accountRegion, boolean isDefault){\n+ private CleverTapInstanceConfig(Context context, String accountId, String accountToken, String accountRegion, boolean isDefault, String customId){\nthis.accountId = accountId;\nthis.accountToken = accountToken;\nthis.accountRegion = accountRegion;\n@@ -34,6 +35,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.debugLevel = CleverTapAPI.LogLevel.INFO.intValue();\nthis.logger = new Logger(this.debugLevel);\nthis.createdPostAppLaunch = false;\n+ this.customId = customId;\nManifestInfo manifest = ManifestInfo.getInstance(context);\nthis.useGoogleAdId = manifest.useGoogleAdId();\n@@ -58,39 +60,42 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.createdPostAppLaunch = config.createdPostAppLaunch;\nthis.sslPinning = config.sslPinning;\nthis.backgroundSync = config.backgroundSync;\n+ this.customId = config.customId;\n}\nprivate CleverTapInstanceConfig(String jsonString) throws Throwable {\ntry{\nJSONObject configJsonObject = new JSONObject(jsonString);\n- if(configJsonObject.has(\"accountId\"))\n- this.accountId = configJsonObject.getString(\"accountId\");\n- if(configJsonObject.has(\"accountToken\"))\n- this.accountToken = configJsonObject.getString(\"accountToken\");\n- if(configJsonObject.has(\"accountRegion\"))\n- this.accountRegion = configJsonObject.getString(\"accountRegion\");\n+ if(configJsonObject.has(Constants.KEY_ACCOUNT_ID))\n+ this.accountId = configJsonObject.getString(Constants.KEY_ACCOUNT_ID);\n+ if(configJsonObject.has(Constants.KEY_ACCOUNT_TOKEN))\n+ this.accountToken = configJsonObject.getString(Constants.KEY_ACCOUNT_TOKEN);\n+ if(configJsonObject.has(Constants.KEY_ACCOUNT_REGION))\n+ this.accountRegion = configJsonObject.getString(Constants.KEY_ACCOUNT_REGION);\nif(configJsonObject.has(\"gcmSenderId\"))\nthis.gcmSenderId = configJsonObject.getString(\"gcmSenderId\");\n- if(configJsonObject.has(\"analyticsOnly\"))\n- this.analyticsOnly = configJsonObject.getBoolean(\"analyticsOnly\");\n- if(configJsonObject.has(\"isDefaultInstance\"))\n- this.isDefaultInstance = configJsonObject.getBoolean(\"isDefaultInstance\");\n- if(configJsonObject.has(\"useGoogleAdId\"))\n- this.useGoogleAdId = configJsonObject.getBoolean(\"useGoogleAdId\");\n- if(configJsonObject.has(\"disableAppLaunchedEvent\"))\n- this.disableAppLaunchedEvent = configJsonObject.getBoolean(\"disableAppLaunchedEvent\");\n- if(configJsonObject.has(\"personalization\"))\n- this.personalization = configJsonObject.getBoolean(\"personalization\");\n- if(configJsonObject.has(\"debugLevel\")) {\n- this.debugLevel = configJsonObject.getInt(\"debugLevel\");\n+ if(configJsonObject.has(Constants.KEY_ANALYTICS_ONLY))\n+ this.analyticsOnly = configJsonObject.getBoolean(Constants.KEY_ANALYTICS_ONLY);\n+ if(configJsonObject.has(Constants.KEY_DEFAULT_INSTANCE))\n+ this.isDefaultInstance = configJsonObject.getBoolean(Constants.KEY_DEFAULT_INSTANCE);\n+ if(configJsonObject.has(Constants.KEY_USE_GOOGLE_AD_ID))\n+ this.useGoogleAdId = configJsonObject.getBoolean(Constants.KEY_USE_GOOGLE_AD_ID);\n+ if(configJsonObject.has(Constants.KEY_DISABLE_APP_LAUNCHED))\n+ this.disableAppLaunchedEvent = configJsonObject.getBoolean(Constants.KEY_DISABLE_APP_LAUNCHED);\n+ if(configJsonObject.has(Constants.KEY_PERSONALIZATION))\n+ this.personalization = configJsonObject.getBoolean(Constants.KEY_PERSONALIZATION);\n+ if(configJsonObject.has(Constants.KEY_DEBUG_LEVEL)) {\n+ this.debugLevel = configJsonObject.getInt(Constants.KEY_DEBUG_LEVEL);\nthis.logger = new Logger(this.debugLevel);\n}\n- if(configJsonObject.has(\"createdPostAppLaunch\"))\n- this.createdPostAppLaunch = configJsonObject.getBoolean(\"createdPostAppLaunch\");\n- if(configJsonObject.has(\"sslPinning\"))\n- this.sslPinning = configJsonObject.getBoolean(\"sslPinning\");\n- if(configJsonObject.has(\"backgroundSync\"))\n- this.backgroundSync = configJsonObject.getBoolean(\"backgroundSync\");\n+ if(configJsonObject.has(Constants.KEY_CREATED_POST_APP_LAUNCH))\n+ this.createdPostAppLaunch = configJsonObject.getBoolean(Constants.KEY_CREATED_POST_APP_LAUNCH);\n+ if(configJsonObject.has(Constants.KEY_SSL_PINNING))\n+ this.sslPinning = configJsonObject.getBoolean(Constants.KEY_SSL_PINNING);\n+ if(configJsonObject.has(Constants.KEY_BACKGROUND_SYNC))\n+ this.backgroundSync = configJsonObject.getBoolean(Constants.KEY_BACKGROUND_SYNC);\n+ if(configJsonObject.has(Constants.KEY_CUSTOM_ID))\n+ this.customId = configJsonObject.getString(Constants.KEY_CUSTOM_ID);\n} catch (Throwable t){\nLogger.v(\"Error constructing CleverTapInstanceConfig from JSON: \" + jsonString +\": \", t.getCause());\nthrow(t);\n@@ -111,6 +116,7 @@ public class CleverTapInstanceConfig implements Parcelable {\ncreatedPostAppLaunch = in.readByte() != 0x00;\nsslPinning = in.readByte() != 0x00;\nbackgroundSync = in.readByte() != 0x00;\n+ customId = in.readString();\n}\n@SuppressWarnings(\"unused\")\n@@ -120,7 +126,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nLogger.i(\"CleverTap accountId and accountToken cannot be null\");\nreturn null;\n}\n- return new CleverTapInstanceConfig(context, accountId, accountToken, null,false);\n+ return new CleverTapInstanceConfig(context, accountId, accountToken, null,false,null);\n}\n@SuppressWarnings({\"unused\"})\n@@ -130,7 +136,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nLogger.i(\"CleverTap accountId and accountToken cannot be null\");\nreturn null;\n}\n- return new CleverTapInstanceConfig(context, accountId, accountToken, accountRegion,false);\n+ return new CleverTapInstanceConfig(context, accountId, accountToken, accountRegion,false,null);\n}\n// for internal use only!\n@@ -146,7 +152,11 @@ public class CleverTapInstanceConfig implements Parcelable {\n// convenience to construct the internal only default config\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\nprotected static CleverTapInstanceConfig createDefaultInstance(Context context, @NonNull String accountId, @NonNull String accountToken, String accountRegion) {\n- return new CleverTapInstanceConfig(context, accountId, accountToken, accountRegion, true);\n+ return new CleverTapInstanceConfig(context, accountId, accountToken, accountRegion, true,null);\n+ }\n+\n+ protected static CleverTapInstanceConfig createDefaultInstance(Context context, @NonNull String accountId, @NonNull String accountToken, String accountRegion, String customId){\n+ return new CleverTapInstanceConfig(context, accountId, accountToken, accountRegion, true,customId);\n}\npublic String getAccountId() {\n@@ -243,6 +253,10 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.backgroundSync = backgroundSync;\n}\n+ public String getCustomId() {\n+ return customId;\n+ }\n+\n@Override\npublic int describeContents() {\nreturn 0;\n@@ -263,6 +277,7 @@ public class CleverTapInstanceConfig implements Parcelable {\ndest.writeByte((byte) (sslPinning ? 0x01 : 0x00));\ndest.writeByte((byte) (createdPostAppLaunch ? 0x01 : 0x00));\ndest.writeByte((byte) (backgroundSync ? 0x01 : 0x00));\n+ dest.writeString(customId);\n}\n@SuppressWarnings(\"unused\")\n@@ -281,19 +296,20 @@ public class CleverTapInstanceConfig implements Parcelable {\nString toJSONString() {\nJSONObject configJsonObject = new JSONObject();\ntry{\n- configJsonObject.put(\"accountId\", getAccountId());\n- configJsonObject.put(\"accountToken\", getAccountToken());\n- configJsonObject.put(\"accountRegion\", getAccountRegion());\n+ configJsonObject.put(Constants.KEY_ACCOUNT_ID, getAccountId());\n+ configJsonObject.put(Constants.KEY_ACCOUNT_TOKEN, getAccountToken());\n+ configJsonObject.put(Constants.KEY_ACCOUNT_REGION, getAccountRegion());\nconfigJsonObject.put(\"gcmSenderId\", getGCMSenderId());\n- configJsonObject.put(\"analyticsOnly\", isAnalyticsOnly());\n- configJsonObject.put(\"isDefaultInstance\", isDefaultInstance());\n- configJsonObject.put(\"useGoogleAdId\", isUseGoogleAdId());\n- configJsonObject.put(\"disableAppLaunchedEvent\", isDisableAppLaunchedEvent());\n- configJsonObject.put(\"personalization\", isPersonalizationEnabled());\n- configJsonObject.put(\"debugLevel\", getDebugLevel());\n- configJsonObject.put(\"createdPostAppLaunch\", isCreatedPostAppLaunch());\n- configJsonObject.put(\"sslPinning\", isSslPinningEnabled());\n- configJsonObject.put(\"backgroundSync\", isBackgroundSync());\n+ configJsonObject.put(Constants.KEY_ANALYTICS_ONLY, isAnalyticsOnly());\n+ configJsonObject.put(Constants.KEY_DEFAULT_INSTANCE, isDefaultInstance());\n+ configJsonObject.put(Constants.KEY_USE_GOOGLE_AD_ID, isUseGoogleAdId());\n+ configJsonObject.put(Constants.KEY_DISABLE_APP_LAUNCHED, isDisableAppLaunchedEvent());\n+ configJsonObject.put(Constants.KEY_PERSONALIZATION, isPersonalizationEnabled());\n+ configJsonObject.put(Constants.KEY_DEBUG_LEVEL, getDebugLevel());\n+ configJsonObject.put(Constants.KEY_CREATED_POST_APP_LAUNCH, isCreatedPostAppLaunch());\n+ configJsonObject.put(Constants.KEY_SSL_PINNING, isSslPinningEnabled());\n+ configJsonObject.put(Constants.KEY_BACKGROUND_SYNC, isBackgroundSync());\n+ configJsonObject.put(Constants.KEY_CUSTOM_ID, getCustomId());\nreturn configJsonObject.toString();\n}catch (Throwable e){\nLogger.v(\"Unable to convert config to JSON : \",e.getCause());\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": "@@ -15,8 +15,9 @@ public class Constants {\nstatic final String LABEL_DISABLE_APP_LAUNCH = \"CLEVERTAP_DISABLE_APP_LAUNCHED\";\nstatic final String LABEL_SSL_PINNING = \"CLEVERTAP_SSL_PINNING\";\nstatic final String LABEL_BACKGROUND_SYNC = \"CLEVERTAP_BACKGROUND_SYNC\";\n+ static final String LABEL_CUSTOM_ID = \"CLEVERTAP_USE_CUSTOM_ID\";\n+ static final String LABEL_USE_GOOGLE_AD_ID = \"LABEL_USE_GOOGLE_AD_ID\";\nstatic final String CLEVERTAP_OPTOUT = \"ct_optout\";\n- static final String CLEVERTAP_USE_GOOGLE_AD_ID = \"CLEVERTAP_USE_GOOGLE_AD_ID\";\nstatic final String CLEVERTAP_STORAGE_TAG = \"WizRocket\";\nstatic final String CLEVERTAP_LOG_TAG = \"CleverTap\";\nstatic final int SESSION_LENGTH_MINS = 20;\n@@ -54,7 +55,7 @@ public class Constants {\nstatic final String INAPP_MAX_DISPLAY_COUNT = \"mdc\";\nstatic final String INAPP_MAX_PER_SESSION = \"imc\";\nstatic final String INAPP_WINDOW = \"w\";\n- static final String PREFS_INAPP_KEY = \"inApp\";\n+ static final String INAPP_KEY = \"inApp\";\nstatic final int INAPP_CLOSE_IV_WIDTH = 40;\nstatic final String DEBUG_KEY = \"d\";\nstatic final String NOTIFICATION_ID_TAG = \"wzrk_id\";\n@@ -108,6 +109,22 @@ public class Constants {\nstatic final String AUDIO_THUMBNAIL = \"ct_audio\";\nstatic final String IMAGE_PLACEHOLDER = \"ct_image\";\nstatic final int LIST_VIEW_WIDTH = 450;\n+ //Keys used by the SDK\n+ static final String KEY_ACCOUNT_ID = \"accountId\";\n+ static final String KEY_ACCOUNT_TOKEN = \"accountToken\";\n+ static final String KEY_ACCOUNT_REGION = \"accountRegion\";\n+ static final String KEY_ANALYTICS_ONLY = \"analyticsOnly\";\n+ static final String KEY_DEFAULT_INSTANCE = \"isDefaultInstance\";\n+ static final String KEY_USE_GOOGLE_AD_ID = \"useGoogleAdId\";\n+ static final String KEY_DISABLE_APP_LAUNCHED = \"disableAppLaunchedEvent\";\n+ static final String KEY_PERSONALIZATION = \"personalization\";\n+ static final String KEY_DEBUG_LEVEL = \"debugLevel\";\n+ static final String KEY_CREATED_POST_APP_LAUNCH = \"createdPostAppLaunch\";\n+ static final String KEY_SSL_PINNING = \"sslPinning\";\n+ static final String KEY_BACKGROUND_SYNC = \"backgroundSync\";\n+ static final String KEY_CUSTOM_ID = \"customId\";\n+ static final String KEY_CONFIG = \"config\";\n+ static final String KEY_C2A = \"wzrk_c2a\";\n/**\n* Profile command constants.\n*/\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": "@@ -79,6 +79,7 @@ class DeviceInfo {\nprotected void initDeviceID() {\ngetDeviceCachedInfo(); // put this here to avoid running on main thread\n+ if(config.getCustomId() == null) {\n// generate a provisional while we do the rest async\ngenerateProvisionalGUID();\n// grab and cache the googleAdID in any event if available\n@@ -91,6 +92,10 @@ class DeviceInfo {\nif (deviceID == null || deviceID.trim().length() <= 2) {\ngenerateDeviceID();\n}\n+ }else{\n+ getConfigLogger().info(config.getAccountId(),\"Updating CleverTapID to given custom ID : \"+config.getCustomId());\n+ forceUpdateDeviceId(config.getCustomId());\n+ }\n}\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": "@@ -17,6 +17,7 @@ class ManifestInfo {\nprivate static String excludedActivities;\nprivate static boolean sslPinning;\nprivate static boolean backgroundSync;\n+ private static String useCustomID;\nprivate static String _getManifestStringValueForKey(Bundle manifest, String name) {\ntry {\n@@ -50,11 +51,13 @@ class ManifestInfo {\nif (gcmSenderId != null) {\ngcmSenderId = gcmSenderId.replace(\"id:\", \"\");\n}\n- useADID = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.CLEVERTAP_USE_GOOGLE_AD_ID));\n+ useADID = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_USE_GOOGLE_AD_ID));\nappLaunchedDisabled = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_DISABLE_APP_LAUNCH));\nexcludedActivities = _getManifestStringValueForKey(metaData,Constants.LABEL_INAPP_EXCLUDE);\nsslPinning = \"1\".equals(_getManifestStringValueForKey(metaData,Constants.LABEL_SSL_PINNING));\nbackgroundSync = \"1\".equals(_getManifestStringValueForKey(metaData,Constants.LABEL_BACKGROUND_SYNC));\n+ if(useCustomID == null)\n+ useCustomID = _getManifestStringValueForKey(metaData,Constants.LABEL_CUSTOM_ID);\n}\nsynchronized static ManifestInfo getInstance(Context context){\n@@ -100,6 +103,10 @@ class ManifestInfo {\nreturn backgroundSync;\n}\n+ String useCustomId(){\n+ return useCustomID;\n+ }\n+\nstatic void changeCredentials(String id, String token, String region){\naccountId = id;\naccountToken = token;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Adding default instance with custom id feature and little refactoring |
116,623 | 04.03.2019 14:55:39 | -19,080 | 798b07e385a7161c2ebb0693d42e774873aa0bd8 | Refactoring keys in CTInAppNotification and added customInAppUrl field | [
{
"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": "@@ -58,6 +58,7 @@ class CTInAppNotification implements Parcelable {\nprivate boolean isTablet;\nprivate boolean videoSupported;\n+ private String customInAppUrl;\nCTInAppNotification(){}\n@@ -70,9 +71,9 @@ class CTInAppNotification implements Parcelable {\nthis.jsonDescription = jsonObject;\ntry {\n- this.type = jsonObject.has(\"type\") ? jsonObject.getString(\"type\") : null;\n+ this.type = jsonObject.has(Constants.KEY_TYPE) ? jsonObject.getString(Constants.KEY_TYPE) : null;\n- if(this.type ==null || this.type.equals(\"custom-html\")){\n+ if(this.type ==null || this.type.equals(Constants.KEY_CUSTOM_HTML)){\nlegacyConfigureWithJson(jsonObject);\n}else{\nconfigureWithJson(jsonObject);\n@@ -94,15 +95,17 @@ class CTInAppNotification implements Parcelable {\ntry {\nthis.id = jsonObject.has(Constants.INAPP_ID_IN_PAYLOAD) ? jsonObject.getString(Constants.INAPP_ID_IN_PAYLOAD) : \"\";\nthis.campaignId = jsonObject.has(Constants.NOTIFICATION_ID_TAG) ? jsonObject.getString(Constants.NOTIFICATION_ID_TAG) : \"\";\n- this.excludeFromCaps = jsonObject.has(\"efc\") && jsonObject.getInt(\"efc\") == 1;\n- this.totalLifetimeCount = jsonObject.has(\"tlc\") ? jsonObject.getInt(\"tlc\") : -1;\n- this.totalDailyCount = jsonObject.has(\"tdc\") ? jsonObject.getInt(\"tdc\") : -1;\n+ this.excludeFromCaps = jsonObject.has(Constants.KEY_EFC) && jsonObject.getInt(Constants.KEY_EFC) == 1;\n+ this.totalLifetimeCount = jsonObject.has(Constants.KEY_TLC) ? jsonObject.getInt(Constants.KEY_TLC) : -1;\n+ this.totalDailyCount = jsonObject.has(Constants.KEY_TDC) ? jsonObject.getInt(Constants.KEY_TDC) : -1;\n- JSONObject data = jsonObject.has(\"d\") ? jsonObject.getJSONObject(\"d\") : null;\n+ JSONObject data = jsonObject.has(Constants.INAPP_DATA_TAG) ? jsonObject.getJSONObject(Constants.INAPP_DATA_TAG) : null;\nif (data != null) {\n- this.html = data.getString(Constants.INAPP_DATA_TAG);\n+ this.html = data.getString(Constants.INAPP_HTML_TAG);\n- this.customExtras = data.has(\"kv\") ? data.getJSONObject(\"kv\") : null;\n+ this.customInAppUrl = data.has(Constants.KEY_URL) ? data.getString(Constants.KEY_URL) : \"\";\n+\n+ this.customExtras = data.has(Constants.KEY_KV) ? data.getJSONObject(Constants.KEY_KV) : null;\nif (this.customExtras == null)\nthis.customExtras = new JSONObject();\n@@ -140,28 +143,28 @@ class CTInAppNotification implements Parcelable {\ntry {\nthis.id = jsonObject.has(Constants.INAPP_ID_IN_PAYLOAD) ? jsonObject.getString(Constants.INAPP_ID_IN_PAYLOAD) : \"\";\nthis.campaignId = jsonObject.has(Constants.NOTIFICATION_ID_TAG) ? jsonObject.getString(Constants.NOTIFICATION_ID_TAG) : \"\";\n- this.type = jsonObject.getString(\"type\");\n- this.excludeFromCaps = jsonObject.has(\"efc\") && jsonObject.getInt(\"efc\") == 1;\n- this.totalLifetimeCount = jsonObject.has(\"tlc\") ? jsonObject.getInt(\"tlc\") : -1;\n- this.totalDailyCount = jsonObject.has(\"tdc\") ? jsonObject.getInt(\"tdc\") : -1;\n+ this.type = jsonObject.getString(Constants.KEY_TYPE);\n+ this.excludeFromCaps = jsonObject.has(Constants.KEY_EFC) && jsonObject.getInt(Constants.KEY_EFC) == 1;\n+ this.totalLifetimeCount = jsonObject.has(Constants.KEY_TLC) ? jsonObject.getInt(Constants.KEY_TLC) : -1;\n+ this.totalDailyCount = jsonObject.has(Constants.KEY_TDC) ? jsonObject.getInt(Constants.KEY_TDC) : -1;\nthis.inAppType = CTInAppType.fromString(this.type);\n- this.isTablet = jsonObject.has(\"tablet\") && jsonObject.getBoolean(\"tablet\");\n- this.backgroundColor = jsonObject.has(\"bg\") ? jsonObject.getString(\"bg\") : \"\";\n- JSONObject titleObject = jsonObject.has(\"title\") ? jsonObject.getJSONObject(\"title\") : null;\n+ this.isTablet = jsonObject.has(Constants.KEY_IS_TABLET) && jsonObject.getBoolean(Constants.KEY_IS_TABLET);\n+ this.backgroundColor = jsonObject.has(Constants.KEY_BG) ? jsonObject.getString(Constants.KEY_BG) : \"\";\n+ JSONObject titleObject = jsonObject.has(Constants.KEY_TITLE) ? jsonObject.getJSONObject(Constants.KEY_TITLE) : null;\nif(titleObject != null) {\n- this.title = titleObject.has(\"text\") ? titleObject.getString(\"text\") : \"\";\n- this.titleColor = titleObject.has(\"color\") ? titleObject.getString(\"color\") : \"\";\n+ this.title = titleObject.has(Constants.KEY_TEXT) ? titleObject.getString(Constants.KEY_TEXT) : \"\";\n+ this.titleColor = titleObject.has(Constants.KEY_COLOR) ? titleObject.getString(Constants.KEY_COLOR) : \"\";\n}\n- JSONObject msgObject = jsonObject.has(\"message\") ? jsonObject.getJSONObject(\"message\") : null;\n+ JSONObject msgObject = jsonObject.has(Constants.KEY_MESSAGE) ? jsonObject.getJSONObject(Constants.KEY_MESSAGE) : null;\nif(msgObject != null) {\n- this.message = msgObject.has(\"text\") ? msgObject.getString(\"text\") : \"\";\n- this.messageColor = msgObject.has(\"color\") ? msgObject.getString(\"color\") : \"\";\n+ this.message = msgObject.has(Constants.KEY_TEXT) ? msgObject.getString(Constants.KEY_TEXT) : \"\";\n+ this.messageColor = msgObject.has(Constants.KEY_COLOR) ? msgObject.getString(Constants.KEY_COLOR) : \"\";\n}\n- this.hideCloseButton = jsonObject.has(\"close\") && jsonObject.getBoolean(\"close\");\n- JSONObject media = jsonObject.has(\"media\") ? jsonObject.getJSONObject(\"media\") : null;\n+ this.hideCloseButton = jsonObject.has(Constants.KEY_HIDE_CLOSE) && jsonObject.getBoolean(Constants.KEY_HIDE_CLOSE);\n+ JSONObject media = jsonObject.has(Constants.KEY_MEDIA) ? jsonObject.getJSONObject(Constants.KEY_MEDIA) : null;\nif(media!=null){\n- this.contentType = media.has(\"content_type\") ? media.getString(\"content_type\") : \"\";\n- String mediaUrl = media.has(\"url\") ? media.getString(\"url\") : \"\";\n+ this.contentType = media.has(Constants.KEY_CONTENT_TYPE) ? media.getString(Constants.KEY_CONTENT_TYPE) : \"\";\n+ String mediaUrl = media.has(Constants.KEY_URL) ? media.getString(Constants.KEY_URL) : \"\";\nif(!mediaUrl.isEmpty()){\nif(this.contentType.startsWith(\"image\")){\nthis.imageUrl = mediaUrl;\n@@ -175,7 +178,7 @@ class CTInAppNotification implements Parcelable {\n}\n}\n}\n- JSONArray buttonArray = jsonObject.has(\"buttons\") ? jsonObject.getJSONArray(\"buttons\") : null;\n+ JSONArray buttonArray = jsonObject.has(Constants.KEY_BUTTONS) ? jsonObject.getJSONArray(Constants.KEY_BUTTONS) : null;\nif(buttonArray != null) {\nfor (int i = 0; i < buttonArray.length(); i++) {\nCTInAppNotificationButton inAppNotificationButton = new CTInAppNotificationButton().initWithJSON(buttonArray.getJSONObject(i));\n@@ -280,7 +283,7 @@ class CTInAppNotification implements Parcelable {\nreturn false;\n// Check that html is set\n- if (!(isKeyValid(d, Constants.INAPP_DATA_TAG, String.class)))\n+ if (!(isKeyValid(d, Constants.INAPP_HTML_TAG, String.class)))\nreturn false;\n// Check that pos contains the right value\n@@ -465,6 +468,10 @@ class CTInAppNotification implements Parcelable {\nreturn buttons;\n}\n+ String getCustomInAppUrl() {\n+ return customInAppUrl;\n+ }\n+\nBitmap getImage() {\nreturn ImageCache.getBitmap(getImageCacheKey());\n}\n@@ -568,6 +575,7 @@ class CTInAppNotification implements Parcelable {\nhideCloseButton = in.readByte() != 0x00;\nbuttonCount = in.readInt();\nisTablet = in.readByte() != 0x00;\n+ customInAppUrl = in.readString();\n}catch (JSONException e){\n// no-op\n@@ -629,7 +637,7 @@ class CTInAppNotification implements Parcelable {\ndest.writeByte((byte) (hideCloseButton ? 0x01 : 0x00));\ndest.writeInt(buttonCount);\ndest.writeByte((byte) (isTablet ? 0x01 : 0x00));\n-\n+ dest.writeString(customInAppUrl);\n}\n@SuppressWarnings(\"unused\")\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": "@@ -37,7 +37,8 @@ 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 INAPP_DATA_TAG = \"html\";\n+ static final String INAPP_HTML_TAG = \"html\";\n+ static final String INAPP_DATA_TAG = \"d\";\nstatic final String INAPP_X_PERCENT = \"xp\";\nstatic final String INAPP_Y_PERCENT = \"yp\";\nstatic final String INAPP_X_DP = \"xdp\";\n@@ -125,6 +126,23 @@ public class Constants {\nstatic final String KEY_CUSTOM_ID = \"customId\";\nstatic final String KEY_CONFIG = \"config\";\nstatic final String KEY_C2A = \"wzrk_c2a\";\n+ static final String KEY_EFC = \"efc\";\n+ static final String KEY_TLC = \"tlc\";\n+ static final String KEY_TDC = \"tdc\";\n+ static final String KEY_KV = \"kv\";\n+ static final String KEY_TYPE = \"type\";\n+ static final String KEY_IS_TABLET = \"tablet\";\n+ static final String KEY_BG = \"bg\";\n+ static final String KEY_TITLE = \"title\";\n+ static final String KEY_TEXT = \"text\";\n+ static final String KEY_COLOR = \"color\";\n+ static final String KEY_MESSAGE= \"message\";\n+ static final String KEY_HIDE_CLOSE = \"close\";\n+ static final String KEY_MEDIA = \"media\";\n+ static final String KEY_CONTENT_TYPE = \"content_type\";\n+ static final String KEY_URL = \"url\";\n+ static final String KEY_BUTTONS = \"buttons\";\n+ static final String KEY_CUSTOM_HTML = \"custom-html\";\n/**\n* Profile command constants.\n*/\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Refactoring keys in CTInAppNotification and added customInAppUrl field |
116,623 | 11.03.2019 16:02:10 | -19,080 | 63ae9ce6a89f0ada8b72085fc487a1a3022417d7 | Updating version and enabling JS from URL and source | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -4,7 +4,7 @@ buildscript {\njcenter()\n}\ndependencies {\n- classpath 'com.android.tools.build:gradle:3.3.0'\n+ classpath 'com.android.tools.build:gradle:3.3.1'\nclasspath 'com.github.dcendents:android-maven-gradle-plugin:2.1'\nclasspath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'\nclasspath 'com.google.gms:google-services:4.2.0'\n@@ -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.4.2'\n+ libraryVersion = '3.4.3'\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.4.2.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.4.3.0\"'\n}\nrelease {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.4.2.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.4.3.0\"'\nminifyEnabled false\nproguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullHtmlFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullHtmlFragment.java",
"diff": "package com.clevertap.android.sdk;\n+import android.annotation.SuppressLint;\nimport android.app.Activity;\nimport android.content.res.Configuration;\nimport android.graphics.drawable.ColorDrawable;\n+import android.os.Build;\nimport android.os.Bundle;\nimport android.support.annotation.Nullable;\nimport android.view.LayoutInflater;\n@@ -38,6 +40,7 @@ public abstract class CTInAppBaseFullHtmlFragment extends CTInAppBaseFullFragmen\nsuper.onCreate(savedInstanceState);\n}\n+ @SuppressLint({\"SetJavaScriptEnabled\", \"AddJavascriptInterface\"})\nprivate View displayHTMLView(LayoutInflater inflater, ViewGroup container){\nView inAppView;\ntry {\n@@ -53,6 +56,18 @@ public abstract class CTInAppBaseFullHtmlFragment extends CTInAppBaseFullFragmen\nInAppWebViewClient webViewClient = new InAppWebViewClient();\nwebView.setWebViewClient(webViewClient);\n+ //Allowing enabling of Javascript from Android 4.2 onwards\n+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {\n+ if (inAppNotification.isJsEnabled()) {\n+ webView.getSettings().setJavaScriptEnabled(true);\n+ webView.getSettings().setJavaScriptCanOpenWindowsAutomatically(false);\n+ webView.getSettings().setAllowContentAccess(false);\n+ webView.getSettings().setAllowFileAccess(false);\n+ webView.getSettings().setAllowFileAccessFromFileURLs(false);\n+ webView.addJavascriptInterface(new CTWebInterface(getActivity(),config),\"CleverTap\");\n+ }\n+ }\n+\nif (isDarkenEnabled())\nrl.setBackgroundDrawable(new ColorDrawable(0xBB000000));\nelse\n@@ -155,6 +170,7 @@ public abstract class CTInAppBaseFullHtmlFragment extends CTInAppBaseFullFragmen\nprivate void reDrawInApp() {\nwebView.updateDimension();\n+ if(!inAppNotification.isInAppUrl()) {\nint mHeight = webView.dim.y;\nint mWidth = webView.dim.x;\n@@ -170,6 +186,10 @@ public abstract class CTInAppBaseFullHtmlFragment extends CTInAppBaseFullFragmen\nwebView.setInitialScale((int) (d * 100));\nwebView.loadDataWithBaseURL(null, html, \"text/html\", \"utf-8\", null);\n+ }else{\n+ String url = inAppNotification.getCustomInAppUrl();\n+ webView.loadUrl(url);\n+ }\n}\n@Override\n"
},
{
"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": "@@ -59,6 +59,8 @@ class CTInAppNotification implements Parcelable {\nprivate boolean isTablet;\nprivate boolean videoSupported;\nprivate String customInAppUrl;\n+ private boolean jsEnabled;\n+ private boolean isInAppUrl;\nCTInAppNotification(){}\n@@ -98,6 +100,8 @@ class CTInAppNotification implements Parcelable {\nthis.excludeFromCaps = jsonObject.has(Constants.KEY_EFC) && jsonObject.getInt(Constants.KEY_EFC) == 1;\nthis.totalLifetimeCount = jsonObject.has(Constants.KEY_TLC) ? jsonObject.getInt(Constants.KEY_TLC) : -1;\nthis.totalDailyCount = jsonObject.has(Constants.KEY_TDC) ? jsonObject.getInt(Constants.KEY_TDC) : -1;\n+ this.jsEnabled = jsonObject.getBoolean(Constants.INAPP_JS_ENABLED);\n+ this.isInAppUrl = jsonObject.getBoolean(Constants.INAPP_IS_URL);\nJSONObject data = jsonObject.has(Constants.INAPP_DATA_TAG) ? jsonObject.getJSONObject(Constants.INAPP_DATA_TAG) : null;\nif (data != null) {\n@@ -472,6 +476,14 @@ class CTInAppNotification implements Parcelable {\nreturn customInAppUrl;\n}\n+ boolean isJsEnabled() {\n+ return jsEnabled;\n+ }\n+\n+ public boolean isInAppUrl() {\n+ return isInAppUrl;\n+ }\n+\nBitmap getImage() {\nreturn ImageCache.getBitmap(getImageCacheKey());\n}\n@@ -576,6 +588,8 @@ class CTInAppNotification implements Parcelable {\nbuttonCount = in.readInt();\nisTablet = in.readByte() != 0x00;\ncustomInAppUrl = in.readString();\n+ jsEnabled = in.readByte() != 0x00;\n+ isInAppUrl = in.readByte() != 0x00;\n}catch (JSONException e){\n// no-op\n@@ -638,6 +652,8 @@ class CTInAppNotification implements Parcelable {\ndest.writeInt(buttonCount);\ndest.writeByte((byte) (isTablet ? 0x01 : 0x00));\ndest.writeString(customInAppUrl);\n+ dest.writeByte((byte) (jsEnabled ? 0x01 : 0x00));\n+ dest.writeByte((byte) (isInAppUrl ? 0x01 : 0x00));\n}\n@SuppressWarnings(\"unused\")\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTWebInterface.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import android.content.Context;\n+import android.webkit.JavascriptInterface;\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.Map;\n+\n+/**\n+ * This class helps WebViews to interact with CleverTapAPI via pre-defined methods\n+ */\n+public class CTWebInterface {\n+\n+ interface CTWebListener {\n+ void pushEventFromJS(String eventName);\n+ void pushEventWithPropertiesFromJS(String eventName, Map<String, Object> eventActions);\n+ void pushProfileFromJS(Map<String,Object> profile);\n+ void addMultiValueForKeyFromJS(String key, String value);\n+ void addMultiValuesForKeyFromJS(String key, ArrayList<String> values);\n+ void removeMultiValueForKeyFromJS(String key, String value);\n+ void removeMultiValuesForKeyFromJS(String key, ArrayList<String> values);\n+ void removeValueForKeyFromJS(String key);\n+ void setMultiValuesForKeyFromJS(String key, ArrayList<String> values);\n+ }\n+\n+ Context context;\n+ CleverTapInstanceConfig config;\n+ private WeakReference<CTWebListener> listenerWeakReference;\n+\n+\n+ public CTWebInterface(Context context, CleverTapInstanceConfig config){\n+ this.context = context;\n+ this.config = config;\n+ setListener(CleverTapAPI.instanceWithConfig(this.context,this.config));\n+ }\n+\n+ private CTWebListener getListener() {\n+ CTWebListener listener = null;\n+ try {\n+ listener = listenerWeakReference.get();\n+ } catch (Throwable t) {\n+ // no-op\n+ }\n+ if (listener == null) {\n+ Logger.v(config.getAccountId(),\"CTWebListener is null\");\n+ }\n+ return listener;\n+ }\n+\n+ private void setListener(CTWebListener listener){\n+ listenerWeakReference = new WeakReference<>(listener);\n+ }\n+\n+ /**\n+ * Method to be called from WebView Javascript to raise event in CleverTap\n+ * @param eventName String value of event name\n+ */\n+ @JavascriptInterface\n+ public void pushEvent(String eventName){\n+ CTWebListener listener = getListener();\n+ if(listener != null){\n+ if(eventName == null){\n+ Logger.v(config.getAccountId(),\"Event name passed to CTWebInterface is null\");\n+ return;\n+ }\n+ listener.pushEventFromJS(eventName);\n+ }\n+ }\n+\n+ /**\n+ * Method to be called from WebView Javascript to raise event with event properties in CleverTap\n+ * @param eventName String value of event name\n+ * @param eventActions Stringified JSON Object of event properties\n+ */\n+ @JavascriptInterface\n+ public void pushEvent(String eventName, String eventActions){\n+ CTWebListener listener = getListener();\n+ if(listener != null){\n+ if(eventName == null){\n+ Logger.v(config.getAccountId(),\"Event name passed to CTWebInterface is null\");\n+ return;\n+ }\n+ if(eventActions!=null){\n+ try {\n+ JSONObject eventActionsObject = new JSONObject(eventActions);\n+ listener.pushEventWithPropertiesFromJS(eventName,Utils.convertJSONObjectToHashMap(eventActionsObject));\n+ } catch (JSONException e) {\n+ Logger.v(config.getAccountId(),\"Unable to parse eventActions from WebView \"+e.getLocalizedMessage());\n+ }\n+ }else{\n+ Logger.v(config.getAccountId(),\"eventActions passed to CTWebInterface is null\");\n+ }\n+ }else{\n+ Logger.v(config.getAccountId(),\"CTWebListener is null\");\n+ }\n+ }\n+\n+ /**\n+ * Method to be called from WebView Javascript to push profile properties in CleverTap\n+ * @param profile Stringified JSON Object of profile properties\n+ */\n+ @JavascriptInterface\n+ public void pushProfile(String profile){\n+ CTWebListener listener = getListener();\n+ if(listener != null){\n+ if(profile!=null){\n+ try {\n+ JSONObject profileObject = new JSONObject(profile);\n+ listener.pushProfileFromJS(Utils.convertJSONObjectToHashMap(profileObject));\n+ } catch (JSONException e) {\n+ Logger.v(config.getAccountId(),\"Unable to parse profile from WebView \"+e.getLocalizedMessage());\n+ }\n+ }else{\n+ Logger.v(config.getAccountId(),\"profile passed to CTWebInterface is null\");\n+ }\n+ }else{\n+ Logger.v(config.getAccountId(),\"CTWebListener is null\");\n+ }\n+ }\n+\n+ /**\n+ * Method to be called from WebView Javascript to add profile properties in CleverTap\n+ * @param key String value of profile property key\n+ * @param value String value of profile property value\n+ */\n+ @JavascriptInterface\n+ public void addMultiValueForKey(String key, String value){\n+ CTWebListener listener = getListener();\n+ if(listener != null){\n+ if(key == null) {\n+ Logger.v(config.getAccountId(),\"Key passed to CTWebInterface is null\");\n+ return;\n+ }\n+ if(value == null) {\n+ Logger.v(config.getAccountId(),\"Value passed to CTWebInterface is null\");\n+ return;\n+ }\n+ listener.addMultiValueForKeyFromJS(key,value);\n+ }\n+ }\n+\n+ /**\n+ * Method to be called from WebView Javascript to add profile properties in CleverTap\n+ * @param key String value of profile property key\n+ * @param values Stringified JSON Array of profile property values\n+ */\n+ @JavascriptInterface\n+ public void addMultiValuesForKey(String key, String values){\n+ CTWebListener listener = getListener();\n+ if(listener != null){\n+ if(key == null) {\n+ Logger.v(config.getAccountId(),\"Key passed to CTWebInterface is null\");\n+ return;\n+ }\n+ if(values != null) {\n+ try{\n+ JSONArray valuesArray = new JSONArray(values);\n+ listener.addMultiValuesForKeyFromJS(key, Utils.convertJSONArrayToArrayList(valuesArray));\n+ }catch (JSONException e){\n+ Logger.v(config.getAccountId(),\"Unable to parse values from WebView \"+e.getLocalizedMessage());\n+ }\n+ }else{\n+ Logger.v(config.getAccountId(),\"values passed to CTWebInterface is null\");\n+ }\n+ }\n+ else{\n+ Logger.v(config.getAccountId(),\"CTWebListener is null\");\n+ }\n+ }\n+\n+ /**\n+ * Method to be called from WebView Javascript to remove profile properties in CleverTap\n+ * @param key String value of profile property key\n+ * @param value String value of profile property value\n+ */\n+ @JavascriptInterface\n+ public void removeMultiValueForKey(String key, String value){\n+ CTWebListener listener = getListener();\n+ if(listener != null){\n+ if(key == null) {\n+ Logger.v(config.getAccountId(),\"Key passed to CTWebInterface is null\");\n+ return;\n+ }\n+ if(value == null) {\n+ Logger.v(config.getAccountId(),\"Value passed to CTWebInterface is null\");\n+ return;\n+ }\n+ listener.removeMultiValueForKeyFromJS(key,value);\n+ }\n+ }\n+\n+ /**\n+ * Method to be called from WebView Javascript to remove profile properties in CleverTap\n+ * @param key String value of profile property key\n+ * @param values Stringified JSON Array of profile property values\n+ */\n+ @JavascriptInterface\n+ public void removeMultiValuesForKey(String key, String values){\n+ CTWebListener listener = getListener();\n+ if(listener != null){\n+ if(key == null) {\n+ Logger.v(config.getAccountId(),\"Key passed to CTWebInterface is null\");\n+ return;\n+ }\n+ if(values != null) {\n+ try{\n+ JSONArray valuesArray = new JSONArray(values);\n+ listener.removeMultiValuesForKeyFromJS(key, Utils.convertJSONArrayToArrayList(valuesArray));\n+ }catch (JSONException e){\n+ Logger.v(config.getAccountId(),\"Unable to parse values from WebView \"+e.getLocalizedMessage());\n+ }\n+ }else{\n+ Logger.v(config.getAccountId(),\"values passed to CTWebInterface is null\");\n+ }\n+ }\n+ else{\n+ Logger.v(config.getAccountId(),\"CTWebListener is null\");\n+ }\n+ }\n+\n+ /**\n+ * Method to be called from WebView Javascript to remove profile properties for given key in CleverTap\n+ * @param key String value of profile property key\n+ */\n+ @JavascriptInterface\n+ public void removeValueForKey(String key){\n+ CTWebListener listener = getListener();\n+ if(listener != null){\n+ if(key == null) {\n+ Logger.v(config.getAccountId(),\"Key passed to CTWebInterface is null\");\n+ return;\n+ }\n+ listener.removeValueForKeyFromJS(key);\n+ }\n+ }\n+\n+ /**\n+ * Method to be called from WebView Javascript to set profile properties in CleverTap\n+ * @param key String value of profile property key\n+ * @param values Stringified JSON Array of profile property values\n+ */\n+ @JavascriptInterface\n+ public void setMultiValueForKey(String key, String values){\n+ CTWebListener listener = getListener();\n+ if(listener != null){\n+ if(key == null) {\n+ Logger.v(config.getAccountId(),\"Key passed to CTWebInterface is null\");\n+ return;\n+ }\n+ if(values != null) {\n+ try{\n+ JSONArray valuesArray = new JSONArray(values);\n+ listener.setMultiValuesForKeyFromJS(key, Utils.convertJSONArrayToArrayList(valuesArray));\n+ }catch (JSONException e){\n+ Logger.v(config.getAccountId(),\"Unable to parse values from WebView \"+e.getLocalizedMessage());\n+ }\n+ }else{\n+ Logger.v(config.getAccountId(),\"values passed to CTWebInterface is null\");\n+ }\n+ }\n+ else{\n+ Logger.v(config.getAccountId(),\"CTWebListener is null\");\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -83,6 +83,7 @@ import static android.content.Context.NOTIFICATION_SERVICE;\npublic class CleverTapAPI implements CTInAppNotification.CTInAppNotificationListener,\nInAppNotificationActivity.InAppActivityListener,\nCTInAppBaseFragment.InAppListener,\n+ CTWebInterface.CTWebListener,\nCTInboxActivity.InboxActivityListener {\n@SuppressWarnings({\"unused\"})\n@@ -540,7 +541,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* @param cleverTapID Custom CleverTapID passed by the app\n* @return The {@link CleverTapInstanceConfig} object\n*/\n- private static CleverTapInstanceConfig getDefaultConfig(Context context, String cleverTapID){\n+ public static CleverTapInstanceConfig getDefaultConfig(Context context, String cleverTapID){\nManifestInfo manifest = ManifestInfo.getInstance(context);\nString accountId = manifest.getAccountId();\nString accountToken = manifest.getAcountToken();\n@@ -554,7 +555,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nLogger.i(\"Account Region not specified in the AndroidManifest - using default region\");\n}\n- if(useCustomIdValue != null){\n+ if(useCustomIdValue != null && useCustomIdValue.equals(\"1\")){\nif(cleverTapID == null){\nLogger.i(\"CleverTap SDK has been directed to use custom CleverTap ID but custom ID passed is NULL. Please provide a valid custom ID.\");\nreturn null;\n@@ -2252,11 +2253,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ngetConfigLogger().verbose(getAccountId(), \"Problem processing queue response, response is null\");\nreturn;\n}\n-\n+ String responseStub = \"{ \\\"arp\\\": { \\\"j_n\\\": 0, \\\"i_n\\\": 132, \\\"d_ts\\\": 1552285989, \\\"dh\\\": -1506910951, \\\"v\\\": 1, \\\"j_s\\\": \\\"{ }\\\", \\\"id\\\": \\\"ZWW-WWW-WWRZ\\\", \\\"wdt\\\": 2, \\\"hgt\\\": 4 }, \\\"inapp_stale\\\": [], \\\"imc\\\": 200, \\\"imp\\\": 500, \\\"inapp_notifs\\\": [ { \\\"type\\\": \\\"custom-html\\\", \\\"adonis\\\": false, \\\"format\\\": \\\"custom-html\\\", \\\"layout_type\\\": \\\"interstitial\\\", \\\"iu\\\" : true, \\\"js\\\" : true, \\\"d\\\": { \\\"html\\\": \\\"<!DOCTYPE html>\\\\n<html>\\\\n<head>\\\\n\\\\t<title></title>\\\\n</head>\\\\n<body>\\\\n<style type=\\\\\\\"text/css\\\\\\\">body {\\\\nbackground-color: #d24dff\\\\n}\\\\n</style>\\\\n<p>HELLO TESTING CUSTOM INAPP</p>\\\\n</body>\\\\n</html>\\\\n\\\", \\\"url\\\":\\\"https://shahharsh093.github.io/inappjs.html\\\" }, \\\"adonisMeta\\\": {}, \\\"display\\\": {}, \\\"w\\\": { \\\"dk\\\": true, \\\"sc\\\": true, \\\"pos\\\": \\\"c\\\", \\\"xp\\\": 90, \\\"yp\\\": 85, \\\"mdc\\\": 1000 }, \\\"og\\\": \\\"<html>\\\\n<head>\\\\n\\\\t<title></title>\\\\n</head>\\\\n<body>\\\\n<style type=\\\\\\\"text/css\\\\\\\">body {\\\\nbackground-color: #d24dff\\\\n}\\\\n</style>\\\\n<p>HELLO TESTING CUSTOM INAPP</p>\\\\n</body>\\\\n</html>\\\\n\\\", \\\"previewHTML\\\": \\\"<!DOCTYPE html>\\\\n<html>\\\\n<head>\\\\n\\\\t<title></title>\\\\n</head>\\\\n<body>\\\\n<style type=\\\\\\\"text/css\\\\\\\">body {\\\\nbackground-color: #d24dff\\\\n}\\\\n</style>\\\\n<p>HELLO TESTING CUSTOM INAPP</p>\\\\n</body>\\\\n</html>\\\\n\\\", \\\"is_native\\\": true, \\\"wzrk_id\\\": \\\"1551876865_20190311\\\", \\\"wzrk_pivot\\\": \\\"wzrk_default\\\", \\\"ti\\\": 1551876865, \\\"efc\\\": 1 } ], \\\"pushamp_notifs\\\": { \\\"list\\\": [], \\\"ack\\\": true, \\\"pf\\\": 240 } }\";\ntry {\n- getConfigLogger().verbose(getAccountId(), \"Trying to process response: \" + responseStr);\n+ getConfigLogger().verbose(getAccountId(), \"Trying to process response: \" + responseStub);\n- JSONObject response = new JSONObject(responseStr);\n+ //JSONObject response = new JSONObject(responseStr);\n+ JSONObject response = new JSONObject(responseStub);\ntry {\nif(!this.config.isAnalyticsOnly())\nprocessInAppResponse(response, context);\n@@ -6700,4 +6702,49 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn currentTimeCalendar.compareTo(startTimeCalendar) >= 0 && currentTimeCalendar.compareTo(stopTimeCalendar) < 0;\n}\n+ //CTWebInterface Overriden Methods\n+ @Override\n+ public void pushEventFromJS(String eventName) {\n+ pushEvent(eventName);\n+ }\n+\n+ @Override\n+ public void pushEventWithPropertiesFromJS(String eventName, Map<String, Object> eventActions) {\n+ pushEvent(eventName,eventActions);\n+ }\n+\n+ @Override\n+ public void pushProfileFromJS(Map<String,Object> profile) {\n+ pushProfile(profile);\n+ }\n+\n+ @Override\n+ public void addMultiValueForKeyFromJS(String key, String value) {\n+ addMultiValueForKey(key,value);\n+ }\n+\n+ @Override\n+ public void addMultiValuesForKeyFromJS(String key, ArrayList<String> values) {\n+ addMultiValuesForKey(key,values);\n+ }\n+\n+ @Override\n+ public void removeMultiValueForKeyFromJS(String key, String value) {\n+ removeMultiValueForKey(key,value);\n+ }\n+\n+ @Override\n+ public void removeMultiValuesForKeyFromJS(String key, ArrayList<String> values) {\n+ removeMultiValuesForKey(key,values);\n+ }\n+\n+ @Override\n+ public void removeValueForKeyFromJS(String key) {\n+ removeValueForKey(key);\n+ }\n+\n+ @Override\n+ public void setMultiValuesForKeyFromJS(String key, ArrayList<String> values) {\n+ setMultiValuesForKey(key,values);\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": "@@ -57,7 +57,9 @@ public class Constants {\nstatic final String INAPP_MAX_PER_SESSION = \"imc\";\nstatic final String INAPP_WINDOW = \"w\";\nstatic final String INAPP_KEY = \"inApp\";\n+ static final String INAPP_IS_URL = \"iu\";\nstatic final int INAPP_CLOSE_IV_WIDTH = 40;\n+ static final String INAPP_JS_ENABLED = \"js\";\nstatic final String DEBUG_KEY = \"d\";\nstatic final String NOTIFICATION_ID_TAG = \"wzrk_id\";\nstatic final String DEEP_LINK_KEY = \"wzrk_dl\";\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": "@@ -12,6 +12,8 @@ import android.net.NetworkInfo;\nimport android.os.Bundle;\nimport android.telephony.TelephonyManager;\n+import org.json.JSONArray;\n+import org.json.JSONException;\nimport org.json.JSONObject;\nimport java.io.ByteArrayOutputStream;\n@@ -19,6 +21,7 @@ import java.io.IOException;\nimport java.io.InputStream;\nimport java.net.HttpURLConnection;\nimport java.net.URL;\n+import java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.Iterator;\n@@ -219,4 +222,18 @@ final class Utils {\nreturn -1;\n}\n}\n+\n+ static ArrayList<String> convertJSONArrayToArrayList(JSONArray array){\n+ ArrayList<String> listdata = new ArrayList<String>();\n+ if (array != null) {\n+ for (int i = 0; i< array.length(); i++){\n+ try {\n+ listdata.add(array.getString(i));\n+ } catch (JSONException e) {\n+ Logger.v(\"Could not convert JSONArray to ArrayList - \" + e.getMessage());\n+ }\n+ }\n+ }\n+ return listdata;\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout/inbox_carousel_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout/inbox_carousel_layout.xml",
"diff": "android:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_marginLeft=\"20dp\"\n+ android:layout_marginStart=\"20dp\"\nandroid:maxLines=\"1\"\nandroid:layout_marginTop=\"20dp\"\nandroid:layout_marginEnd=\"20dp\"\nandroid:text=\"Message\"\nandroid:maxLines=\"3\"\nandroid:layout_marginLeft=\"20dp\"\n+ android:layout_marginStart=\"20dp\"\nandroid:layout_marginTop=\"5dp\"\nandroid:layout_marginRight=\"20dp\"\n+ android:layout_marginEnd=\"20dp\"\nandroid:textColor=\"@android:color/darker_gray\"\nandroid:layout_below=\"@+id/messageTitle\"/>\n<LinearLayout\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout/inbox_icon_message_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout/inbox_icon_message_layout.xml",
"diff": "android:layout_width=\"68dp\"\nandroid:layout_height=\"68dp\"\nandroid:layout_marginLeft=\"8dp\"\n+ android:layout_marginStart=\"8dp\"\nandroid:layout_marginTop=\"8dp\"\nandroid:layout_marginBottom=\"8dp\"\nandroid:layout_marginRight=\"8dp\"\n+ android:layout_marginEnd=\"8dp\"\nandroid:layout_gravity=\"center\"\nandroid:scaleType=\"fitCenter\" />\n<LinearLayout\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_marginLeft=\"10dp\"\n+ android:layout_marginStart=\"10dp\"\nandroid:maxLines=\"1\"\nandroid:layout_marginTop=\"10dp\"\nandroid:layout_marginEnd=\"20dp\"\nandroid:text=\"Title\"\nandroid:textStyle=\"bold\"\nandroid:textColor=\"@android:color/black\"\n- android:layout_marginRight=\"20dp\"\n- android:layout_marginStart=\"10dp\" />\n+ android:layout_marginRight=\"20dp\" />\n<TextView\nandroid:id=\"@+id/messageText\"\nandroid:layout_width=\"match_parent\"\nandroid:text=\"Message\"\nandroid:maxLines=\"3\"\nandroid:layout_marginLeft=\"10dp\"\n+ android:layout_marginStart=\"10dp\"\nandroid:layout_marginTop=\"5dp\"\nandroid:layout_marginRight=\"20dp\"\n+ android:layout_marginEnd=\"20dp\"\nandroid:textColor=\"@android:color/darker_gray\" />\n</LinearLayout>\n</LinearLayout>\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout/inbox_simple_message_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout/inbox_simple_message_layout.xml",
"diff": "android:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_marginLeft=\"20dp\"\n+ android:layout_marginStart=\"20dp\"\nandroid:maxLines=\"1\"\nandroid:layout_marginTop=\"20dp\"\nandroid:layout_marginEnd=\"20dp\"\nandroid:text=\"Message\"\nandroid:maxLines=\"3\"\nandroid:layout_marginLeft=\"20dp\"\n+ android:layout_marginStart=\"20dp\"\nandroid:layout_marginTop=\"5dp\"\nandroid:layout_marginRight=\"20dp\"\n+ android:layout_marginEnd=\"20dp\"\nandroid:textColor=\"@android:color/darker_gray\"\nandroid:layout_below=\"@+id/messageTitle\"/>\n<LinearLayout\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Updating version and enabling JS from URL and source |
116,623 | 11.03.2019 16:14:55 | -19,080 | 88f61aa06890ddbd329383b119901e5c4fcfae88 | Removing stub code | [
{
"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": "@@ -2253,12 +2253,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ngetConfigLogger().verbose(getAccountId(), \"Problem processing queue response, response is null\");\nreturn;\n}\n- String responseStub = \"{ \\\"arp\\\": { \\\"j_n\\\": 0, \\\"i_n\\\": 132, \\\"d_ts\\\": 1552285989, \\\"dh\\\": -1506910951, \\\"v\\\": 1, \\\"j_s\\\": \\\"{ }\\\", \\\"id\\\": \\\"ZWW-WWW-WWRZ\\\", \\\"wdt\\\": 2, \\\"hgt\\\": 4 }, \\\"inapp_stale\\\": [], \\\"imc\\\": 200, \\\"imp\\\": 500, \\\"inapp_notifs\\\": [ { \\\"type\\\": \\\"custom-html\\\", \\\"adonis\\\": false, \\\"format\\\": \\\"custom-html\\\", \\\"layout_type\\\": \\\"interstitial\\\", \\\"iu\\\" : true, \\\"js\\\" : true, \\\"d\\\": { \\\"html\\\": \\\"<!DOCTYPE html>\\\\n<html>\\\\n<head>\\\\n\\\\t<title></title>\\\\n</head>\\\\n<body>\\\\n<style type=\\\\\\\"text/css\\\\\\\">body {\\\\nbackground-color: #d24dff\\\\n}\\\\n</style>\\\\n<p>HELLO TESTING CUSTOM INAPP</p>\\\\n</body>\\\\n</html>\\\\n\\\", \\\"url\\\":\\\"https://shahharsh093.github.io/inappjs.html\\\" }, \\\"adonisMeta\\\": {}, \\\"display\\\": {}, \\\"w\\\": { \\\"dk\\\": true, \\\"sc\\\": true, \\\"pos\\\": \\\"c\\\", \\\"xp\\\": 90, \\\"yp\\\": 85, \\\"mdc\\\": 1000 }, \\\"og\\\": \\\"<html>\\\\n<head>\\\\n\\\\t<title></title>\\\\n</head>\\\\n<body>\\\\n<style type=\\\\\\\"text/css\\\\\\\">body {\\\\nbackground-color: #d24dff\\\\n}\\\\n</style>\\\\n<p>HELLO TESTING CUSTOM INAPP</p>\\\\n</body>\\\\n</html>\\\\n\\\", \\\"previewHTML\\\": \\\"<!DOCTYPE html>\\\\n<html>\\\\n<head>\\\\n\\\\t<title></title>\\\\n</head>\\\\n<body>\\\\n<style type=\\\\\\\"text/css\\\\\\\">body {\\\\nbackground-color: #d24dff\\\\n}\\\\n</style>\\\\n<p>HELLO TESTING CUSTOM INAPP</p>\\\\n</body>\\\\n</html>\\\\n\\\", \\\"is_native\\\": true, \\\"wzrk_id\\\": \\\"1551876865_20190311\\\", \\\"wzrk_pivot\\\": \\\"wzrk_default\\\", \\\"ti\\\": 1551876865, \\\"efc\\\": 1 } ], \\\"pushamp_notifs\\\": { \\\"list\\\": [], \\\"ack\\\": true, \\\"pf\\\": 240 } }\";\ntry {\n- getConfigLogger().verbose(getAccountId(), \"Trying to process response: \" + responseStub);\n+ getConfigLogger().verbose(getAccountId(), \"Trying to process response: \" + responseStr);\n- //JSONObject response = new JSONObject(responseStr);\n- JSONObject response = new JSONObject(responseStub);\n+ JSONObject response = new JSONObject(responseStr);\ntry {\nif(!this.config.isAnalyticsOnly())\nprocessInAppResponse(response, context);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Removing stub code |
116,623 | 12.03.2019 16:30:24 | -19,080 | 3f13531dc3e47edb27662ac38c4b99a9ee0d47ea | Refactoring wzrk keys and adding Notification Viewed key check in ManifestInfo | [
{
"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": "@@ -4747,7 +4747,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif(cleverTapID == null) {\ng = _deviceInfo.forceNewDeviceID();\n}else{\n- getConfigLogger().info(getAccountId(),\"Updating CleverTapID to given custom ID : \"+config.getCustomId());\n+ getConfigLogger().info(getAccountId(),\"Updating CleverTapID to given custom ID : \"+config.getCustomCleverTapId());\ng = _deviceInfo.forceUpdateDeviceId(cleverTapID);\n}\nnotifyUserProfileInitialized(g);\n@@ -5262,44 +5262,20 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ntry {\ngetConfigLogger().debug(getAccountId(), \"Handling notification: \" + extras.toString());\ndbAdapter = loadDBAdapter(context);\n- if(extras.getString(\"wzrk_pid\") != null) {\n- if (dbAdapter.doesPushNotificationIdExist(extras.getString(\"wzrk_pid\"))){\n- getConfigLogger().debug(getAccountId(),\"Push Notification Already rendered, not showing again\");\n+ if(extras.getString(Constants.WZRK_PUSH_ID) != null) {\n+ if (dbAdapter.doesPushNotificationIdExist(extras.getString(Constants.WZRK_PUSH_ID))){\n+ getConfigLogger().debug(getAccountId(),\"Push Notification already rendered, not showing again\");\nreturn;\n}\n}\n- // Check if this is a test notification\n- if (extras.containsKey(Constants.DEBUG_KEY)\n- && \"y\".equals(extras.getString(Constants.DEBUG_KEY))) {\n- int r = (int) (Math.random() * 10);\n- if (r != 8) {\n- // Discard acknowledging this notif\n- return;\n- }\n- JSONObject event = new JSONObject();\n- try {\n- JSONObject actions = new JSONObject();\n- for (String x : extras.keySet()) {\n- Object value = extras.get(x);\n- actions.put(x, value);\n- }\n- event.put(\"evtName\", \"wzrk_d\");\n- event.put(\"evtData\", actions);\n- queueEvent(context, event, Constants.RAISED_EVENT);\n- } catch (JSONException ignored) {\n- // Won't happen\n- }\n- // Drop further processing\n- return;\n- }\n- String notifMessage = extras.getString(\"nm\");\n+ String notifMessage = extras.getString(Constants.NOTIF_MSG);\nnotifMessage = (notifMessage != null) ? notifMessage : \"\";\nif (notifMessage.isEmpty()) {\ngetConfigLogger().verbose(getAccountId(),\"Push notification message is empty, not rendering\");\nloadDBAdapter(context).storeUninstallTimestamp();\nreturn;\n}\n- String notifTitle = extras.getString(\"nt\", \"\");\n+ String notifTitle = extras.getString(Constants.NOTIF_TITLE, \"\");\nnotifTitle = notifTitle.isEmpty() ? context.getApplicationInfo().name : notifTitle;\ntriggerNotification(context, extras, notifMessage, notifTitle, notificationId);\n} catch (Throwable t) {\n@@ -5316,20 +5292,20 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nprivate void triggerNotification(Context context, Bundle extras, String notifMessage, String notifTitle, int notificationId){\n- String icoPath = extras.getString(\"ico\");\n+ String icoPath = extras.getString(Constants.NOTIF_ICON);\nIntent launchIntent = new Intent(context, CTPushNotificationReceiver.class);\nPendingIntent pIntent;\n// Take all the properties from the notif and add it to the intent\nlaunchIntent.putExtras(extras);\n- launchIntent.removeExtra(\"wzrk_acts\");\n+ launchIntent.removeExtra(Constants.WZRK_ACTIONS);\nlaunchIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);\npIntent = PendingIntent.getBroadcast(context, (int) System.currentTimeMillis(),\nlaunchIntent, PendingIntent.FLAG_UPDATE_CURRENT);\nNotificationCompat.Style style;\n- String bigPictureUrl = extras.getString(\"wzrk_bp\");\n+ String bigPictureUrl = extras.getString(Constants.WZRK_BIG_PICTURE);\nif (bigPictureUrl != null && bigPictureUrl.startsWith(\"http\")) {\ntry {\nBitmap bpMap = Utils.getNotificationBitmap(bigPictureUrl, false, context);\n@@ -5338,8 +5314,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (bpMap == null)\nthrow new Exception(\"Failed to fetch big picture!\");\n- if(extras.containsKey(\"wzrk_nms\")){\n- String summaryText = extras.getString(\"wzrk_nms\");\n+ if(extras.containsKey(Constants.WZRK_MSG_SUMMARY)){\n+ String summaryText = extras.getString(Constants.WZRK_MSG_SUMMARY);\nstyle = new NotificationCompat.BigPictureStyle()\n.setSummaryText(summaryText)\n.bigPicture(bpMap);\n@@ -5369,12 +5345,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nint priorityInt = NotificationCompat.PRIORITY_DEFAULT;\n- String priority = extras.getString(\"pr\");\n+ String priority = extras.getString(Constants.NOTIF_PRIORITY);\nif (priority != null) {\n- if (priority.equals(\"high\")) {\n+ if (priority.equals(Constants.PRIORITY_HIGH)) {\npriorityInt = NotificationCompat.PRIORITY_HIGH;\n}\n- if (priority.equals(\"max\")) {\n+ if (priority.equals(Constants.PRIORITY_MAX)) {\npriorityInt = NotificationCompat.PRIORITY_MAX;\n}\n}\n@@ -5382,7 +5358,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// if we have not user set notificationID then try collapse key\nif (notificationId == Constants.EMPTY_NOTIFICATION_ID) {\ntry {\n- Object collapse_key = extras.get(\"wzrk_ck\");\n+ Object collapse_key = extras.get(Constants.WZRK_COLLAPSE);\nif(collapse_key != null) {\nif (collapse_key instanceof Number) {\nnotificationId = ((Number) collapse_key).intValue();\n@@ -5412,14 +5388,14 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nNotificationCompat.Builder nb;\nif (context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.O){\n- String channelId = extras.getString(\"wzrk_cid\", \"\");\n+ String channelId = extras.getString(Constants.WZRK_CHANNEL_ID, \"\");\nif (channelId.isEmpty()) {\ngetConfigLogger().debug(getAccountId(), \"ChannelId is empty for notification: \" + extras.toString());\n}\nnb = new NotificationCompat.Builder(context,channelId);\n// choices here are Notification.BADGE_ICON_NONE = 0, Notification.BADGE_ICON_SMALL = 1, Notification.BADGE_ICON_LARGE = 2. Default is Notification.BADGE_ICON_LARGE\n- String badgeIconParam = extras.getString(\"wzrk_bi\", null);\n+ String badgeIconParam = extras.getString(Constants.WZRK_BADGE_ICON, null);\nif (badgeIconParam != null) {\ntry {\nint badgeIconType = Integer.parseInt(badgeIconParam);\n@@ -5431,7 +5407,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n- String badgeCountParam = extras.getString(\"wzrk_bc\", null);\n+ String badgeCountParam = extras.getString(Constants.WZRK_BADGE_COUNT, null);\nif (badgeCountParam != null) {\ntry {\nint badgeCount = Integer.parseInt(badgeCountParam);\n@@ -5442,15 +5418,15 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// no-op\n}\n}\n- if(extras.containsKey(\"wzrk_st\")){\n- nb.setSubText(extras.getString(\"wzrk_st\"));\n+ if(extras.containsKey(Constants.WZRK_SUBTITLE)){\n+ nb.setSubText(extras.getString(Constants.WZRK_SUBTITLE));\n}\n} else {\nnb = new NotificationCompat.Builder(context);\n}\n- if(extras.containsKey(\"wzrk_clr\")){\n- int color = Color.parseColor(extras.getString(\"wzrk_clr\"));\n+ if(extras.containsKey(Constants.WZRK_COLOR)){\n+ int color = Color.parseColor(extras.getString(Constants.WZRK_COLOR));\nnb.setColor(color);\nnb.setColorized(true);\n}\n@@ -5466,10 +5442,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nnb.setLargeIcon(Utils.getNotificationBitmap(icoPath, true, context));\ntry {\n- if (extras.containsKey(\"wzrk_sound\")) {\n+ if (extras.containsKey(Constants.WZRK_SOUND)) {\nUri soundUri = null;\n- Object o = extras.get(\"wzrk_sound\");\n+ Object o = extras.get(Constants.WZRK_SOUND);\nif ((o instanceof Boolean && (Boolean) o)) {\nsoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);\n@@ -5496,7 +5472,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// add actions if any\nJSONArray actions = null;\n- String actionsString = extras.getString(\"wzrk_acts\");\n+ String actionsString = extras.getString(Constants.WZRK_ACTIONS);\nif (actionsString != null) {\ntry {\nactions = new JSONArray(actionsString);\n@@ -5514,7 +5490,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nJSONObject action = actions.getJSONObject(i);\nString label = action.optString(\"l\");\nString dl = action.optString(\"dl\");\n- String ico = action.optString(\"ico\");\n+ String ico = action.optString(Constants.NOTIF_ICON);\nString id = action.optString(\"id\");\nboolean autoCancel = action.optBoolean(\"ac\", true);\nif (label.isEmpty() || id.isEmpty()) {\n@@ -5550,7 +5526,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (actionLaunchIntent != null) {\nactionLaunchIntent.putExtras(extras);\n- actionLaunchIntent.removeExtra(\"wzrk_acts\");\n+ actionLaunchIntent.removeExtra(Constants.WZRK_ACTIONS);\nactionLaunchIntent.putExtra(\"actionId\", id);\nactionLaunchIntent.putExtra(\"autoCancel\", autoCancel);\nactionLaunchIntent.putExtra(\"wzrk_c2a\", id);\n@@ -5585,12 +5561,15 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (notificationManager != null) {\nnotificationManager.notify(notificationId, n);\n- String ttl = extras.getString(\"wzrk_ttl\",(System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL)/1000+\"\");\n+ String ttl = extras.getString(Constants.WZRK_TIME_TO_LIVE,(System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL)/1000+\"\");\nlong wzrk_ttl = Long.parseLong(ttl);\n- String wzrk_pid = extras.getString(\"wzrk_pid\");\n+ String wzrk_pid = extras.getString(Constants.WZRK_PUSH_ID);\nDBAdapter dbAdapter = loadDBAdapter(context);\ngetConfigLogger().verbose(\"Storing Push Notification...\"+wzrk_pid + \" - with ttl - \"+ttl);\ndbAdapter.storePushNotificationId(wzrk_pid,wzrk_ttl);\n+ if(config != null && config.getRaiseNotificationViewed()){\n+ pushNotificationViewedEvent(extras);\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"diff": "@@ -24,6 +24,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nprivate boolean sslPinning;\nprivate boolean backgroundSync;\nprivate String customId;\n+ private boolean raiseNotificationViewed;\nprivate CleverTapInstanceConfig(Context context, String accountId, String accountToken, String accountRegion, boolean isDefault, String customId){\nthis.accountId = accountId;\n@@ -35,7 +36,9 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.debugLevel = CleverTapAPI.LogLevel.INFO.intValue();\nthis.logger = new Logger(this.debugLevel);\nthis.createdPostAppLaunch = false;\n- this.customId = customId;\n+ if(customId != null) {\n+ this.customId = Constants.CUSTOM_CLEVERTAP_ID_PREFIX+customId;\n+ }\nManifestInfo manifest = ManifestInfo.getInstance(context);\nthis.useGoogleAdId = manifest.useGoogleAdId();\n@@ -43,6 +46,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.gcmSenderId = manifest.getGCMSenderId();\nthis.sslPinning = manifest.isSSLPinningEnabled();\nthis.backgroundSync = manifest.isBackgroundSync();\n+ this.raiseNotificationViewed = manifest.raiseNotificationViewed();\n}\nCleverTapInstanceConfig(CleverTapInstanceConfig config){\n@@ -61,6 +65,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.sslPinning = config.sslPinning;\nthis.backgroundSync = config.backgroundSync;\nthis.customId = config.customId;\n+ this.raiseNotificationViewed = config.raiseNotificationViewed;\n}\nprivate CleverTapInstanceConfig(String jsonString) throws Throwable {\n@@ -96,6 +101,8 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.backgroundSync = configJsonObject.getBoolean(Constants.KEY_BACKGROUND_SYNC);\nif(configJsonObject.has(Constants.KEY_CUSTOM_ID))\nthis.customId = configJsonObject.getString(Constants.KEY_CUSTOM_ID);\n+ if(configJsonObject.has(Constants.KEY_RAISE_NOTIFICATION_VIEWED))\n+ this.raiseNotificationViewed = configJsonObject.getBoolean(Constants.KEY_RAISE_NOTIFICATION_VIEWED);\n} catch (Throwable t){\nLogger.v(\"Error constructing CleverTapInstanceConfig from JSON: \" + jsonString +\": \", t.getCause());\nthrow(t);\n@@ -117,6 +124,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nsslPinning = in.readByte() != 0x00;\nbackgroundSync = in.readByte() != 0x00;\ncustomId = in.readString();\n+ raiseNotificationViewed = in.readByte() != 0x00;\n}\n@SuppressWarnings(\"unused\")\n@@ -253,10 +261,22 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.backgroundSync = backgroundSync;\n}\n- public String getCustomId() {\n+ String getCustomCleverTapId() {\nreturn customId;\n}\n+ public void setCleverTapId(String customId) {\n+ this.customId = customId;\n+ }\n+\n+ public void setRaiseNotificationViewed(boolean raiseNotificationViewed) {\n+ this.raiseNotificationViewed = raiseNotificationViewed;\n+ }\n+\n+ boolean getRaiseNotificationViewed() {\n+ return raiseNotificationViewed;\n+ }\n+\n@Override\npublic int describeContents() {\nreturn 0;\n@@ -278,6 +298,7 @@ public class CleverTapInstanceConfig implements Parcelable {\ndest.writeByte((byte) (createdPostAppLaunch ? 0x01 : 0x00));\ndest.writeByte((byte) (backgroundSync ? 0x01 : 0x00));\ndest.writeString(customId);\n+ dest.writeByte((byte) (raiseNotificationViewed ? 0x01 : 0x00));\n}\n@SuppressWarnings(\"unused\")\n@@ -309,7 +330,8 @@ public class CleverTapInstanceConfig implements Parcelable {\nconfigJsonObject.put(Constants.KEY_CREATED_POST_APP_LAUNCH, isCreatedPostAppLaunch());\nconfigJsonObject.put(Constants.KEY_SSL_PINNING, isSslPinningEnabled());\nconfigJsonObject.put(Constants.KEY_BACKGROUND_SYNC, isBackgroundSync());\n- configJsonObject.put(Constants.KEY_CUSTOM_ID, getCustomId());\n+ configJsonObject.put(Constants.KEY_CUSTOM_ID, getCustomCleverTapId());\n+ configJsonObject.put(Constants.KEY_RAISE_NOTIFICATION_VIEWED, getRaiseNotificationViewed());\nreturn configJsonObject.toString();\n}catch (Throwable e){\nLogger.v(\"Unable to convert config to JSON : \",e.getCause());\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": "@@ -16,7 +16,8 @@ public class Constants {\nstatic final String LABEL_SSL_PINNING = \"CLEVERTAP_SSL_PINNING\";\nstatic final String LABEL_BACKGROUND_SYNC = \"CLEVERTAP_BACKGROUND_SYNC\";\nstatic final String LABEL_CUSTOM_ID = \"CLEVERTAP_USE_CUSTOM_ID\";\n- static final String LABEL_USE_GOOGLE_AD_ID = \"LABEL_USE_GOOGLE_AD_ID\";\n+ static final String LABEL_USE_GOOGLE_AD_ID = \"CLEVERTAP_USE_GOOGLE_AD_ID\";\n+ static final String LABEL_RAISE_NOTIFICATION_VIEWED = \"CLEVERTAP_RAISE_NOTIFICATION_VIEWED\";\nstatic final String CLEVERTAP_OPTOUT = \"ct_optout\";\nstatic final String CLEVERTAP_STORAGE_TAG = \"WizRocket\";\nstatic final String CLEVERTAP_LOG_TAG = \"CleverTap\";\n@@ -145,6 +146,25 @@ public class Constants {\nstatic final String KEY_URL = \"url\";\nstatic final String KEY_BUTTONS = \"buttons\";\nstatic final String KEY_CUSTOM_HTML = \"custom-html\";\n+ static final String KEY_RAISE_NOTIFICATION_VIEWED = \"getRaiseNotificationViewed\";\n+ static final String WZRK_PUSH_ID = \"wzrk_pid\";\n+ static final String NOTIF_MSG = \"nm\";\n+ static final String NOTIF_TITLE = \"nt\";\n+ static final String NOTIF_ICON = \"ico\";\n+ static final String WZRK_ACTIONS = \"wzrk_acts\";\n+ static final String WZRK_BIG_PICTURE = \"wzrk_bp\";\n+ static final String WZRK_MSG_SUMMARY = \"wzrk_nms\";\n+ static final String NOTIF_PRIORITY = \"pr\";\n+ static final String PRIORITY_HIGH = \"high\";\n+ static final String PRIORITY_MAX = \"max\";\n+ static final String WZRK_COLLAPSE = \"wzrk_ck\";\n+ static final String WZRK_CHANNEL_ID = \"wzrk_cid\";\n+ static final String WZRK_BADGE_ICON = \"wzrk_bi\";\n+ static final String WZRK_BADGE_COUNT = \"wzrk_bc\";\n+ static final String WZRK_SUBTITLE = \"wzrk_st\";\n+ static final String WZRK_COLOR = \"wzrk_clr\";\n+ static final String WZRK_SOUND = \"wzrk_sound\";\n+ static final String WZRK_TIME_TO_LIVE = \"wzrk_ttl\";\n/**\n* Profile command constants.\n*/\n@@ -154,6 +174,7 @@ public class Constants {\nstatic final String COMMAND_DELETE = \"$delete\";\nstatic final String GUID_PREFIX_GOOGLE_AD_ID = \"__g\";\n+ static final String CUSTOM_CLEVERTAP_ID_PREFIX = \"$\";\n// valid profile identifier keys\nstatic final Set<String> PROFILE_IDENTIFIER_KEYS = new HashSet<>(Arrays.asList(\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": "@@ -79,7 +79,7 @@ class DeviceInfo {\nprotected void initDeviceID() {\ngetDeviceCachedInfo(); // put this here to avoid running on main thread\n- if(config.getCustomId() == null) {\n+ if(config.getCustomCleverTapId() == null) {\n// generate a provisional while we do the rest async\ngenerateProvisionalGUID();\n// grab and cache the googleAdID in any event if available\n@@ -93,8 +93,8 @@ class DeviceInfo {\ngenerateDeviceID();\n}\n}else{\n- getConfigLogger().info(config.getAccountId(),\"Updating CleverTapID to given custom ID : \"+config.getCustomId());\n- forceUpdateDeviceId(config.getCustomId());\n+ getConfigLogger().info(config.getAccountId(),\"Updating CleverTapID to given custom ID : \"+config.getCustomCleverTapId());\n+ forceUpdateDeviceId(config.getCustomCleverTapId());\n}\n}\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": "@@ -18,6 +18,7 @@ class ManifestInfo {\nprivate static boolean sslPinning;\nprivate static boolean backgroundSync;\nprivate static String useCustomID;\n+ private static boolean raiseNotificationViewed;\nprivate static String _getManifestStringValueForKey(Bundle manifest, String name) {\ntry {\n@@ -56,9 +57,11 @@ class ManifestInfo {\nexcludedActivities = _getManifestStringValueForKey(metaData,Constants.LABEL_INAPP_EXCLUDE);\nsslPinning = \"1\".equals(_getManifestStringValueForKey(metaData,Constants.LABEL_SSL_PINNING));\nbackgroundSync = \"1\".equals(_getManifestStringValueForKey(metaData,Constants.LABEL_BACKGROUND_SYNC));\n- if(useCustomID == null)\n+ if(useCustomID == null) {\nuseCustomID = _getManifestStringValueForKey(metaData, Constants.LABEL_CUSTOM_ID);\n}\n+ raiseNotificationViewed = \"1\".equals(_getManifestStringValueForKey(metaData,Constants.LABEL_RAISE_NOTIFICATION_VIEWED));\n+ }\nsynchronized static ManifestInfo getInstance(Context context){\nif (instance == null) {\n@@ -107,6 +110,10 @@ class ManifestInfo {\nreturn useCustomID;\n}\n+ boolean raiseNotificationViewed(){\n+ return raiseNotificationViewed;\n+ }\n+\nstatic void changeCredentials(String id, String token, String region){\naccountId = id;\naccountToken = token;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Refactoring wzrk keys and adding Notification Viewed key check in ManifestInfo |
116,623 | 19.03.2019 18:43:50 | -19,080 | 270d45639123497ba1682517379ffcde5e2e180f | Added new layout for Carousel Image template and commented out Notification Viewed domain code | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTCarouselImageViewHolder.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import android.app.Activity;\n+import android.content.Context;\n+import android.graphics.Color;\n+import android.os.Handler;\n+import android.support.annotation.NonNull;\n+import android.support.v4.view.ViewPager;\n+import android.view.Gravity;\n+import android.view.View;\n+import android.widget.ImageView;\n+import android.widget.LinearLayout;\n+import android.widget.RelativeLayout;\n+import android.widget.TextView;\n+\n+public class CTCarouselImageViewHolder extends CTInboxBaseMessageViewHolder {\n+\n+ private CTCarouselViewPager imageViewPager;\n+ private LinearLayout sliderDots;\n+ private TextView carouselTimestamp;\n+ private ImageView carouselReadDot;\n+ private RelativeLayout clickLayout;\n+\n+ CTCarouselImageViewHolder(@NonNull View itemView) {\n+ super(itemView);\n+ imageViewPager = itemView.findViewById(R.id.image_carousel_viewpager);\n+ sliderDots = itemView.findViewById(R.id.sliderDots);\n+ carouselTimestamp = itemView.findViewById(R.id.carousel_timestamp);\n+ carouselReadDot = itemView.findViewById(R.id.carousel_read_circle);\n+ clickLayout = itemView.findViewById(R.id.body_relative_layout);\n+ }\n+\n+ @Override\n+ void configureWithMessage(final CTInboxMessage inboxMessage, final CTInboxListViewFragment parent, final int position) {\n+ super.configureWithMessage(inboxMessage, parent, position);\n+ final CTInboxListViewFragment parentWeak = getParent();\n+ // noinspection ConstantConditions\n+ final Context appContext = parent.getActivity().getApplicationContext();\n+ CTInboxMessageContent content = inboxMessage.getInboxMessageContents().get(0);\n+ this.carouselTimestamp.setVisibility(View.VISIBLE);\n+ if(inboxMessage.isRead()){\n+ this.carouselReadDot.setVisibility(View.GONE);\n+ }else{\n+ this.carouselReadDot.setVisibility(View.VISIBLE);\n+ }\n+ String carouselImageDisplayTimestamp = calculateDisplayTimestamp(inboxMessage.getDate());\n+ this.carouselTimestamp.setText(carouselImageDisplayTimestamp);\n+ this.carouselTimestamp.setTextColor(Color.parseColor(content.getTitleColor()));\n+\n+ this.clickLayout.setBackgroundColor(Color.parseColor(inboxMessage.getBgColor()));\n+\n+ //Loads the viewpager\n+ LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) this.imageViewPager.getLayoutParams();\n+ CTCarouselViewPagerAdapter carouselViewPagerAdapter = new CTCarouselViewPagerAdapter(appContext, parent, inboxMessage,layoutParams,position);\n+ this.imageViewPager.setAdapter(carouselViewPagerAdapter);\n+ //Adds the dots for the carousel\n+ //int dotsCount = carouselViewPagerAdapter.getCount();\n+ int dotsCount = inboxMessage.getInboxMessageContents().size();\n+ if(this.sliderDots.getChildCount()>0){\n+ this.sliderDots.removeAllViews();\n+ }\n+ ImageView[] dots = new ImageView[dotsCount];\n+ for(int k=0;k<dotsCount;k++){\n+ dots[k] = new ImageView(parent.getActivity());\n+ dots[k].setVisibility(View.VISIBLE);\n+ // noinspection ConstantConditions\n+ dots[k].setImageDrawable(appContext.getResources().getDrawable(R.drawable.unselected_dot));\n+ LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);\n+ params.setMargins(8, 6, 4, 6);\n+ params.gravity = Gravity.CENTER;\n+ if(this.sliderDots.getChildCount() < dotsCount)\n+ this.sliderDots.addView(dots[k],params);\n+ }\n+ // noinspection ConstantConditions\n+ dots[0].setImageDrawable(parent.getActivity().getApplicationContext().getResources().getDrawable(R.drawable.selected_dot));\n+ CTCarouselImageViewHolder.CarouselPageChangeListener carouselPageChangeListener = new CTCarouselImageViewHolder.CarouselPageChangeListener(parent.getActivity().getApplicationContext(), this, dots, inboxMessage);\n+ this.imageViewPager.addOnPageChangeListener(carouselPageChangeListener);\n+\n+ this.clickLayout.setOnClickListener(new CTInboxButtonClickListener(position, inboxMessage,null, parentWeak, this.imageViewPager));\n+\n+ Runnable carouselRunnable = new Runnable() {\n+ @Override\n+ public void run() {\n+ Activity activity = parent.getActivity();\n+ if (activity == null) return;\n+ activity.runOnUiThread(new Runnable() {\n+ @Override\n+ public void run() {\n+ if(carouselReadDot.getVisibility() == View.VISIBLE){\n+ if (parentWeak != null) {\n+ parentWeak.didShow(null, position);\n+ }\n+ }\n+ carouselReadDot.setVisibility(View.GONE);\n+ }\n+ });\n+ }\n+ };\n+ Handler carouselHandler = new Handler();\n+ carouselHandler.postDelayed(carouselRunnable,2000);\n+ }\n+\n+ /**\n+ * Custom PageChangeListener for Carousel\n+ */\n+ class CarouselPageChangeListener implements ViewPager.OnPageChangeListener {\n+ private CTCarouselImageViewHolder viewHolder;\n+ private ImageView[] dots;\n+ private CTInboxMessage inboxMessage;\n+ private Context context;\n+\n+ CarouselPageChangeListener(Context context, CTCarouselImageViewHolder viewHolder, ImageView[] dots, CTInboxMessage inboxMessage) {\n+ this.context = context;\n+ this.viewHolder = viewHolder;\n+ this.dots = dots;\n+ this.inboxMessage = inboxMessage;\n+ this.dots[0].setImageDrawable(context.getResources().getDrawable(R.drawable.selected_dot));\n+ }\n+\n+ @Override\n+ public void onPageScrolled(int i, float v, int i1) {\n+\n+ }\n+\n+ @Override\n+ public void onPageSelected(int position) {\n+ for (ImageView dot : this.dots) {\n+ dot.setImageDrawable(context.getResources().getDrawable(R.drawable.unselected_dot));\n+ }\n+ dots[position].setImageDrawable(context.getResources().getDrawable(R.drawable.selected_dot));\n+ }\n+\n+ @Override\n+ public void onPageScrollStateChanged(int i) {\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxMessageAdapter.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxMessageAdapter.java",
"diff": "@@ -35,9 +35,11 @@ class CTInboxMessageAdapter extends RecyclerView.Adapter {\nview = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.inbox_icon_message_layout,viewGroup,false);\nreturn new CTIconMessageViewHolder(view);\ncase CAROUSEL:\n+ view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.inbox_carousel_text_layout,viewGroup,false);\n+ return new CTCarouselMessageViewHolder(view);\ncase IMAGE_CAROUSEL:\nview = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.inbox_carousel_layout,viewGroup,false);\n- return new CTCarouselMessageViewHolder(view);\n+ return new CTCarouselImageViewHolder(view);\n}\nreturn null;\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": "@@ -235,11 +235,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nthis.deviceInfo = DeviceInfo.initWithConfig(context, config);\nthis.validator = new Validator();\nthis.inAppFCManager = new InAppFCManager(context, config);\n-\ninitializeDeviceInfo();\npostAsyncSafely(\"CleverTapAPI#initializeDeviceInfo\", new Runnable() {\n@Override\npublic void run() {\n+\nif (config.isDefaultInstance()) {\nmanifestAsyncValidation();\n}\n@@ -1967,15 +1967,15 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (domainName == null || domainName.trim().length() == 0) {\nreturn true;\n}\n-\n- final String spikyDomainName = conn.getHeaderField(Constants.SPIKY_HEADER_DOMAIN_NAME);\n- if (spikyDomainName == null || spikyDomainName.trim().length() == 0) {\n- return true;\n- }\n+//TODO uncomment once Spiky backend changes are done\n+// final String spikyDomainName = conn.getHeaderField(Constants.SPIKY_HEADER_DOMAIN_NAME);\n+// if (spikyDomainName == null || spikyDomainName.trim().length() == 0) {\n+// return true;\n+// }\nsetMuted(context, false);\nsetDomain(context, domainName);\n- setSpikyDomain(context,spikyDomainName);\n+ //setSpikyDomain(context,spikyDomainName);\nreturn true;\n}\n@@ -4942,7 +4942,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@SuppressWarnings(\"SameParameterValue\")\nprivate void pushDeviceToken(final boolean register, final boolean force) {\n- if (enabledPushTypes == null) return;\n+ if (enabledPushTypes == null) {\n+ //Fixed onUserlogin issue where token was not getting unregistered when enabledPushTypes was not set\n+ enabledPushTypes = this.deviceInfo.getEnabledPushTypes();\n+ }\nfor (PushType pushType : enabledPushTypes) {\nswitch (pushType) {\ncase GCM:\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": "@@ -117,7 +117,7 @@ class DBAdapter {\n\" (\" + KEY_CREATED_AT + \");\";\nprivate static final String CREATE_NOTIFICATION_VIEWED_TABLE =\n- \"CREATE TABLE \" + Table.PUSH_NOTIFICATIONS.getName() + \" (_id INTEGER PRIMARY KEY AUTOINCREMENT, \" +\n+ \"CREATE TABLE \" + Table.PUSH_NOTIFICATION_VIEWED.getName() + \" (_id INTEGER PRIMARY KEY AUTOINCREMENT, \" +\nKEY_DATA + \" STRING NOT NULL, \" +\nKEY_CREATED_AT + \" INTEGER NOT NULL);\";\n@@ -168,7 +168,7 @@ class DBAdapter {\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.PUSH_NOTIFICATIONS.getName());\n+ //db.execSQL(\"DROP TABLE IF EXISTS \" + Table.PUSH_NOTIFICATIONS.getName());\ndb.execSQL(\"DROP TABLE IF EXISTS \" + Table.UNINSTALL_TS.getName());\ndb.execSQL(\"DROP TABLE IF EXISTS \" + Table.INBOX_MESSAGES.getName());\ndb.execSQL(\"DROP TABLE IF EXISTS \" + Table.PUSH_NOTIFICATION_VIEWED.getName());\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": "@@ -45,7 +45,7 @@ class DeviceInfo {\nthis.context = context;\nthis.config = config;\nthis.handler = new Handler();\n- sl = CleverTapAPI.instanceWithConfig(context, config).getSyncListener();\n+ //sl = CleverTapAPI.instanceWithConfig(context, config).getSyncListener();\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_icon_message_layout.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:orientation=\"vertical\" android:layout_width=\"match_parent\"\n+ android:layout_height=\"match_parent\">\n+\n+ <RelativeLayout\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\">\n+\n+ <LinearLayout\n+ android:id=\"@+id/body_relative_layout\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:weightSum=\"2\">\n+\n+ <RelativeLayout\n+ android:id=\"@+id/media_layout\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_weight=\"1\">\n+\n+ <com.clevertap.android.sdk.RectangleImageView\n+ android:id=\"@+id/media_image\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:src=\"@drawable/ct_video_1\"\n+ android:visibility=\"visible\" />\n+\n+ <com.clevertap.android.sdk.SquareImageView\n+ android:id=\"@+id/square_media_image\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:visibility=\"gone\" />\n+\n+ <FrameLayout\n+ android:id=\"@+id/icon_message_frame_layout\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:visibility=\"gone\"></FrameLayout>\n+\n+ <FrameLayout\n+ android:id=\"@+id/icon_progress_frame_layout\"\n+ android:layout_width=\"fill_parent\"\n+ android:layout_height=\"fill_parent\"\n+ android:visibility=\"gone\">\n+\n+ <ProgressBar\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_gravity=\"center_horizontal|center_vertical\"\n+ android:visibility=\"visible\" />\n+ </FrameLayout>\n+ </RelativeLayout>\n+\n+ <RelativeLayout\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_weight=\"1\">\n+\n+ <LinearLayout\n+ android:id=\"@+id/content_relative_layout\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_alignParentStart=\"true\"\n+ android:layout_alignParentLeft=\"true\"\n+ android:layout_marginStart=\"0dp\"\n+ android:layout_marginLeft=\"0dp\"\n+ android:orientation=\"horizontal\">\n+\n+ <ImageView\n+ android:id=\"@+id/image_icon\"\n+ android:layout_width=\"68dp\"\n+ android:layout_height=\"68dp\"\n+ android:layout_gravity=\"center\"\n+ android:layout_marginStart=\"8dp\"\n+ android:layout_marginLeft=\"8dp\"\n+ android:layout_marginTop=\"8dp\"\n+ android:layout_marginEnd=\"8dp\"\n+ android:layout_marginRight=\"8dp\"\n+ android:layout_marginBottom=\"8dp\"\n+ android:scaleType=\"fitCenter\" />\n+\n+ <TextView\n+ android:id=\"@+id/messageTitle\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_marginStart=\"10dp\"\n+ android:layout_marginLeft=\"10dp\"\n+ android:layout_marginTop=\"10dp\"\n+ android:layout_marginEnd=\"20dp\"\n+ android:layout_marginRight=\"20dp\"\n+ android:maxLines=\"2\"\n+ android:text=\"Title\"\n+ android:textColor=\"@android:color/black\"\n+ android:textStyle=\"bold\" />\n+\n+ </LinearLayout>\n+ <TextView\n+ android:id=\"@+id/messageText\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_below=\"@id/content_relative_layout\"\n+ android:layout_marginStart=\"10dp\"\n+ android:layout_marginLeft=\"10dp\"\n+ android:layout_marginTop=\"5dp\"\n+ android:layout_marginEnd=\"20dp\"\n+ android:layout_marginRight=\"20dp\"\n+ android:maxLines=\"3\"\n+ android:text=\"Message\"\n+ android:textColor=\"@android:color/darker_gray\" />\n+ </RelativeLayout>\n+ </LinearLayout>\n+\n+ <LinearLayout\n+ android:id=\"@+id/timestamp_linear_layout\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_above=\"@id/cta_linear_layout\"\n+ android:gravity=\"end\"\n+ android:orientation=\"horizontal\">\n+\n+ <TextView\n+ android:id=\"@+id/timestamp\"\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_marginEnd=\"10dp\"\n+ android:layout_marginRight=\"10dp\"\n+ android:gravity=\"end\"\n+ android:text=\"timestamp\"\n+ android:textColor=\"@android:color/darker_gray\" />\n+\n+ <ImageView\n+ android:id=\"@+id/read_circle\"\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_gravity=\"center\"\n+ android:layout_marginEnd=\"20dp\"\n+ android:layout_marginRight=\"20dp\"\n+ android:src=\"@drawable/read_circle\" />\n+ </LinearLayout>\n+ <LinearLayout\n+ android:id=\"@+id/cta_linear_layout\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"44dp\"\n+ android:layout_below=\"@+id/body_relative_layout\"\n+ android:background=\"@android:color/white\"\n+ android:orientation=\"horizontal\"\n+ android:weightSum=\"6\">\n+\n+ <Button\n+ android:id=\"@+id/cta_button_1\"\n+ android:layout_width=\"0dp\"\n+ android:layout_height=\"match_parent\"\n+ android:layout_weight=\"2\"\n+ android:background=\"@android:color/white\"\n+ android:padding=\"2dp\"\n+ android:text=\"CTA1\"\n+ android:textColor=\"@android:color/holo_blue_light\"\n+ android:textSize=\"14sp\"\n+ android:visibility=\"gone\" />\n+\n+ <Button\n+ android:id=\"@+id/cta_button_2\"\n+ android:layout_width=\"0dp\"\n+ android:layout_height=\"match_parent\"\n+ android:layout_weight=\"2\"\n+ android:background=\"@android:color/white\"\n+ android:padding=\"2dp\"\n+ android:text=\"CTA2\"\n+ android:textColor=\"@android:color/holo_blue_light\"\n+ android:textSize=\"14sp\"\n+ android:visibility=\"gone\" />\n+\n+ <Button\n+ android:id=\"@+id/cta_button_3\"\n+ android:layout_width=\"0dp\"\n+ android:layout_height=\"match_parent\"\n+ android:layout_weight=\"2\"\n+ android:background=\"@android:color/white\"\n+ android:padding=\"2dp\"\n+ android:text=\"CTA3\"\n+ android:textColor=\"@android:color/holo_blue_light\"\n+ android:textSize=\"14sp\"\n+ android:visibility=\"gone\" />\n+ </LinearLayout>\n+ </RelativeLayout>\n+</LinearLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_simple_message_layout.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<RelativeLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:orientation=\"vertical\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:elevation=\"8dp\"\n+ android:id=\"@+id/simple_message_relative_layout\">\n+ <RelativeLayout\n+ android:id=\"@+id/click_relative_layout\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\">\n+ <RelativeLayout\n+ android:id=\"@+id/media_layout\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\">\n+ <com.clevertap.android.sdk.RectangleImageView\n+ android:id=\"@+id/media_image\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:scaleType=\"centerCrop\"\n+ android:visibility=\"gone\"/>\n+ <com.clevertap.android.sdk.SquareImageView\n+ android:id=\"@+id/square_media_image\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:scaleType=\"centerCrop\"\n+ android:visibility=\"gone\"/>\n+ <FrameLayout\n+ android:id=\"@+id/simple_message_frame_layout\"\n+ android:layout_width=\"match_parent\"\n+ android:visibility=\"gone\"\n+ android:layout_height=\"wrap_content\">\n+ </FrameLayout>\n+ <FrameLayout\n+ android:id=\"@+id/simple_progress_frame_layout\"\n+ android:layout_width=\"fill_parent\"\n+ android:layout_height=\"fill_parent\"\n+ android:visibility=\"gone\">\n+ <ProgressBar\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_gravity=\"center_horizontal|center_vertical\"\n+ android:visibility=\"visible\"/>\n+ </FrameLayout>\n+ </RelativeLayout>\n+ <RelativeLayout\n+ android:id=\"@+id/body_relative_layout\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:orientation=\"vertical\"\n+ android:background=\"@android:color/white\"\n+ android:layout_below=\"@+id/media_layout\">\n+ <TextView\n+ android:id=\"@+id/messageTitle\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_marginLeft=\"20dp\"\n+ android:layout_marginStart=\"20dp\"\n+ android:maxLines=\"1\"\n+ android:layout_marginTop=\"20dp\"\n+ android:layout_marginEnd=\"20dp\"\n+ android:text=\"Message title\"\n+ android:textStyle=\"bold\"\n+ android:textColor=\"@android:color/black\"\n+ android:layout_marginRight=\"20dp\" />\n+ <TextView\n+ android:id=\"@+id/messageText\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:text=\"Message\"\n+ android:maxLines=\"3\"\n+ android:layout_marginLeft=\"20dp\"\n+ android:layout_marginStart=\"20dp\"\n+ android:layout_marginTop=\"5dp\"\n+ android:layout_marginRight=\"20dp\"\n+ android:layout_marginEnd=\"20dp\"\n+ android:textColor=\"@android:color/darker_gray\"\n+ android:layout_below=\"@+id/messageTitle\"/>\n+ <LinearLayout\n+ android:id=\"@+id/timestamp_linear_layout\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_below=\"@+id/messageText\"\n+ android:orientation=\"horizontal\"\n+ android:layout_marginTop=\"20dp\"\n+ android:layout_marginBottom=\"10dp\"\n+ android:gravity=\"end\">\n+ <TextView\n+ android:id=\"@+id/timestamp\"\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:gravity=\"end\"\n+ android:layout_marginRight=\"10dp\"\n+ android:text=\"timestamp\"\n+ android:textColor=\"@android:color/darker_gray\"\n+ android:layout_marginEnd=\"10dp\" />\n+ <ImageView\n+ android:id=\"@+id/read_circle\"\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:src=\"@drawable/read_circle\"\n+ android:layout_gravity=\"center\"\n+ android:layout_marginRight=\"20dp\"\n+ android:layout_marginEnd=\"20dp\" />\n+ </LinearLayout>\n+ <View\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"1dp\"\n+ android:layout_below=\"@+id/timestamp_linear_layout\"\n+ android:background=\"@android:color/darker_gray\"/>\n+ </RelativeLayout>\n+ </RelativeLayout>\n+ <LinearLayout\n+ android:id=\"@+id/cta_linear_layout\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"44dp\"\n+ android:layout_below=\"@id/click_relative_layout\"\n+ android:orientation=\"horizontal\"\n+ android:weightSum=\"6\"\n+ android:background=\"@android:color/white\">\n+ <Button\n+ android:id=\"@+id/cta_button_1\"\n+ android:layout_weight=\"2\"\n+ android:layout_width=\"0dp\"\n+ android:layout_height=\"match_parent\"\n+ android:textSize=\"14sp\"\n+ android:padding=\"2dp\"\n+ android:text=\"CTA1\"\n+ android:textColor=\"@android:color/holo_blue_light\"\n+ android:visibility=\"gone\"\n+ android:background=\"@android:color/white\"/>\n+ <Button\n+ android:id=\"@+id/cta_button_2\"\n+ android:layout_weight=\"2\"\n+ android:layout_width=\"0dp\"\n+ android:layout_height=\"match_parent\"\n+ android:textSize=\"14sp\"\n+ android:padding=\"2dp\"\n+ android:visibility=\"gone\"\n+ android:text=\"CTA2\"\n+ android:textColor=\"@android:color/holo_blue_light\"\n+ android:background=\"@android:color/white\"/>\n+ <Button\n+ android:id=\"@+id/cta_button_3\"\n+ android:layout_weight=\"2\"\n+ android:layout_width=\"0dp\"\n+ android:layout_height=\"match_parent\"\n+ android:textSize=\"14sp\"\n+ android:padding=\"2dp\"\n+ android:visibility=\"gone\"\n+ android:text=\"CTA3\"\n+ android:textColor=\"@android:color/holo_blue_light\"\n+ android:background=\"@android:color/white\"/>\n+ </LinearLayout>\n+</RelativeLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout/inbox_carousel_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout/inbox_carousel_layout.xml",
"diff": "android:layout_marginEnd=\"20dp\" />\n</LinearLayout>\n</LinearLayout>\n- <TextView\n- android:id=\"@+id/messageTitle\"\n- android:layout_width=\"match_parent\"\n- android:layout_height=\"wrap_content\"\n- android:layout_marginLeft=\"20dp\"\n- android:layout_marginStart=\"20dp\"\n- android:maxLines=\"1\"\n- android:layout_marginTop=\"20dp\"\n- android:layout_marginEnd=\"20dp\"\n- android:text=\"Title\"\n- android:textStyle=\"bold\"\n- android:textColor=\"@android:color/black\"\n- android:layout_marginRight=\"20dp\"\n- android:layout_below=\"@+id/carousel_linear_layout\"/>\n- <TextView\n- android:id=\"@+id/messageText\"\n- android:layout_width=\"match_parent\"\n- android:layout_height=\"wrap_content\"\n- android:text=\"Message\"\n- android:maxLines=\"3\"\n- android:layout_marginLeft=\"20dp\"\n- android:layout_marginStart=\"20dp\"\n- android:layout_marginTop=\"5dp\"\n- android:layout_marginRight=\"20dp\"\n- android:layout_marginEnd=\"20dp\"\n- android:textColor=\"@android:color/darker_gray\"\n- android:layout_below=\"@+id/messageTitle\"/>\n- <LinearLayout\n- android:layout_width=\"match_parent\"\n- android:layout_height=\"wrap_content\"\n- android:layout_below=\"@+id/messageText\"\n- android:orientation=\"horizontal\"\n- android:layout_marginTop=\"20dp\"\n- android:layout_marginBottom=\"10dp\"\n- android:gravity=\"end\">\n- <TextView\n- android:id=\"@+id/timestamp\"\n- android:layout_width=\"wrap_content\"\n- android:layout_height=\"wrap_content\"\n- android:gravity=\"end\"\n- android:layout_marginRight=\"10dp\"\n- android:text=\"timestamp\"\n- android:textColor=\"@android:color/darker_gray\"\n- android:layout_marginEnd=\"10dp\" />\n- <ImageView\n- android:id=\"@+id/read_circle\"\n- android:layout_width=\"wrap_content\"\n- android:layout_height=\"wrap_content\"\n- android:src=\"@drawable/read_circle\"\n- android:layout_gravity=\"center\"\n- android:layout_marginRight=\"20dp\"\n- android:layout_marginEnd=\"20dp\" />\n- </LinearLayout>\n</RelativeLayout>\n</RelativeLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/res/layout/inbox_carousel_text_layout.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<RelativeLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:orientation=\"vertical\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:elevation=\"8dp\"\n+ android:id=\"@+id/carousel_message_relative_layout\">\n+ <RelativeLayout\n+ android:id=\"@+id/body_relative_layout\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:orientation=\"vertical\"\n+ android:background=\"@android:color/white\">\n+ <LinearLayout\n+ android:id=\"@+id/carousel_linear_layout\"\n+ android:orientation=\"vertical\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:visibility=\"visible\">\n+ <com.clevertap.android.sdk.CTCarouselViewPager\n+ android:id=\"@+id/image_carousel_viewpager\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\" />\n+ <LinearLayout\n+ android:id=\"@+id/sliderDots\"\n+ android:orientation=\"horizontal\"\n+ android:layout_width=\"match_parent\"\n+ android:gravity=\"center\"\n+ android:layout_height=\"wrap_content\">\n+ </LinearLayout>\n+ <LinearLayout\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:orientation=\"horizontal\"\n+ android:layout_marginTop=\"-20dp\"\n+ android:layout_gravity=\"end\">\n+ <TextView\n+ android:id=\"@+id/carousel_timestamp\"\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:gravity=\"end\"\n+ android:layout_marginRight=\"5dp\"\n+ android:text=\"timestamp\"\n+ android:textColor=\"@android:color/darker_gray\"\n+ android:layout_marginEnd=\"5dp\" />\n+ <ImageView\n+ android:id=\"@+id/carousel_read_circle\"\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:src=\"@drawable/read_circle\"\n+ android:layout_gravity=\"center\"\n+ android:layout_marginRight=\"20dp\"\n+ android:layout_marginEnd=\"20dp\" />\n+ </LinearLayout>\n+ </LinearLayout>\n+ <TextView\n+ android:id=\"@+id/messageTitle\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_marginLeft=\"20dp\"\n+ android:layout_marginStart=\"20dp\"\n+ android:maxLines=\"1\"\n+ android:layout_marginTop=\"20dp\"\n+ android:layout_marginEnd=\"20dp\"\n+ android:text=\"Title\"\n+ android:textStyle=\"bold\"\n+ android:textColor=\"@android:color/black\"\n+ android:layout_marginRight=\"20dp\"\n+ android:layout_below=\"@+id/carousel_linear_layout\"/>\n+ <TextView\n+ android:id=\"@+id/messageText\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:text=\"Message\"\n+ android:maxLines=\"3\"\n+ android:layout_marginLeft=\"20dp\"\n+ android:layout_marginStart=\"20dp\"\n+ android:layout_marginTop=\"5dp\"\n+ android:layout_marginRight=\"20dp\"\n+ android:layout_marginEnd=\"20dp\"\n+ android:textColor=\"@android:color/darker_gray\"\n+ android:layout_below=\"@+id/messageTitle\"/>\n+ <LinearLayout\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_below=\"@+id/messageText\"\n+ android:orientation=\"horizontal\"\n+ android:layout_marginTop=\"20dp\"\n+ android:layout_marginBottom=\"10dp\"\n+ android:gravity=\"end\">\n+ <TextView\n+ android:id=\"@+id/timestamp\"\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:gravity=\"end\"\n+ android:layout_marginRight=\"10dp\"\n+ android:text=\"timestamp\"\n+ android:textColor=\"@android:color/darker_gray\"\n+ android:layout_marginEnd=\"10dp\" />\n+ <ImageView\n+ android:id=\"@+id/read_circle\"\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:src=\"@drawable/read_circle\"\n+ android:layout_gravity=\"center\"\n+ android:layout_marginRight=\"20dp\"\n+ android:layout_marginEnd=\"20dp\" />\n+ </LinearLayout>\n+ </RelativeLayout>\n+</RelativeLayout>\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Added new layout for Carousel Image template and commented out Notification Viewed domain code |
116,623 | 25.03.2019 18:01:04 | -19,080 | 14f8b7744669c46c7959710453e533e2cbec8a88 | Add ability to fetch FCM token using specific sender 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": "@@ -44,6 +44,8 @@ import com.google.android.gms.gcm.GoogleCloudMessaging;\nimport com.google.android.gms.iid.InstanceID;\nimport com.google.android.gms.plus.model.people.Person;\nimport com.google.firebase.iid.FirebaseInstanceId;\n+import com.google.firebase.messaging.FirebaseMessaging;\n+\nimport org.json.JSONArray;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n@@ -790,6 +792,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//Push\nprivate void doFCMRefresh() {\n+ final DeviceInfo _deviceInfo = this.deviceInfo;\npostAsyncSafely(\"FcmManager#doFCMRefresh\", new Runnable() {\n@Override\npublic void run() {\n@@ -799,7 +802,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn;\n}\n- String freshToken = FCMGetFreshToken();\n+ String freshToken = FCMGetFreshToken(_deviceInfo.getFCMSenderID());\nif (freshToken == null) return;\ncacheFCMToken(freshToken);\n@@ -854,11 +857,15 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* request token from FCM\n*/\n- private String FCMGetFreshToken() {\n+ private String FCMGetFreshToken(final String senderID) {\ngetConfigLogger().verbose(getAccountId(), \"FcmManager: Requesting a FCM token\");\nString token = null;\ntry {\n+ if(senderID != null){\n+ token = FirebaseInstanceId.getInstance().getToken(senderID, FirebaseMessaging.INSTANCE_ID_SCOPE);\n+ }else {\ntoken = FirebaseInstanceId.getInstance().getToken();\n+ }\ngetConfigLogger().info(getAccountId(),\"FCM token: \"+token);\n} catch (Throwable t) {\ngetConfigLogger().verbose(getAccountId(), \"FcmManager: Error requesting FCM token\", t);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"diff": "@@ -26,6 +26,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nprivate String customId;\nprivate boolean raiseNotificationViewed;\nprivate boolean enableCustomCleverTapId;\n+ private String fcmSenderId;\nprivate CleverTapInstanceConfig(Context context, String accountId, String accountToken, String accountRegion, boolean isDefault, String customId){\nthis.accountId = accountId;\n@@ -49,6 +50,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.sslPinning = manifest.isSSLPinningEnabled();\nthis.backgroundSync = manifest.isBackgroundSync();\nthis.raiseNotificationViewed = manifest.raiseNotificationViewed();\n+ this.fcmSenderId = manifest.getFCMSenderId();\n}\nCleverTapInstanceConfig(CleverTapInstanceConfig config){\n@@ -69,6 +71,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.customId = config.customId;\nthis.raiseNotificationViewed = config.raiseNotificationViewed;\nthis.enableCustomCleverTapId = config.enableCustomCleverTapId;\n+ this.fcmSenderId = config.fcmSenderId;\n}\nprivate CleverTapInstanceConfig(String jsonString) throws Throwable {\n@@ -108,6 +111,8 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.raiseNotificationViewed = configJsonObject.getBoolean(Constants.KEY_RAISE_NOTIFICATION_VIEWED);\nif(configJsonObject.has(Constants.KEY_ENABLE_CUSTOM_CT_ID))\nthis.enableCustomCleverTapId = configJsonObject.getBoolean(Constants.KEY_ENABLE_CUSTOM_CT_ID);\n+ if(configJsonObject.has(Constants.KEY_FCM_SENDER_ID))\n+ this.gcmSenderId = configJsonObject.getString(Constants.KEY_FCM_SENDER_ID);\n} catch (Throwable t){\nLogger.v(\"Error constructing CleverTapInstanceConfig from JSON: \" + jsonString +\": \", t.getCause());\nthrow(t);\n@@ -131,6 +136,7 @@ public class CleverTapInstanceConfig implements Parcelable {\ncustomId = in.readString();\nraiseNotificationViewed = in.readByte() != 0x00;\nenableCustomCleverTapId = in.readByte() != 0x00;\n+ fcmSenderId = in.readString();\n}\n@SuppressWarnings(\"unused\")\n@@ -287,6 +293,10 @@ public class CleverTapInstanceConfig implements Parcelable {\nreturn enableCustomCleverTapId;\n}\n+ public String getFCMSenderId() {\n+ return fcmSenderId;\n+ }\n+\n@Override\npublic int describeContents() {\nreturn 0;\n@@ -310,6 +320,7 @@ public class CleverTapInstanceConfig implements Parcelable {\ndest.writeString(customId);\ndest.writeByte((byte) (raiseNotificationViewed ? 0x01 : 0x00));\ndest.writeByte((byte) (enableCustomCleverTapId ? 0x01 : 0x00));\n+ dest.writeString(fcmSenderId);\n}\n@SuppressWarnings(\"unused\")\n@@ -344,6 +355,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nconfigJsonObject.put(Constants.KEY_CUSTOM_ID, getCustomCleverTapId());\nconfigJsonObject.put(Constants.KEY_RAISE_NOTIFICATION_VIEWED, getRaiseNotificationViewed());\nconfigJsonObject.put(Constants.KEY_ENABLE_CUSTOM_CT_ID, getEnableCustomCleverTapId());\n+ configJsonObject.put(Constants.KEY_FCM_SENDER_ID, getFCMSenderId());\nreturn configJsonObject.toString();\n}catch (Throwable e){\nLogger.v(\"Unable to convert config to JSON : \",e.getCause());\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": "@@ -70,6 +70,7 @@ public class Constants {\nstatic final String SESSION_ID_LAST = \"lastSessionId\";\nstatic final String LAST_SESSION_EPOCH = \"sexe\";\nstatic final String LABEL_SENDER_ID = \"GCM_SENDER_ID\";\n+ static final String LABEL_FCM_SENDER_ID = \"FCM_SENDER_ID\";\nstatic final int MAX_KEY_LENGTH = 120;\nstatic final int MAX_VALUE_LENGTH = 512;\nstatic final int MAX_MULTI_VALUE_ARRAY_LENGTH = 100;\n@@ -129,6 +130,7 @@ public class Constants {\nstatic final String KEY_SSL_PINNING = \"sslPinning\";\nstatic final String KEY_BACKGROUND_SYNC = \"backgroundSync\";\nstatic final String KEY_CUSTOM_ID = \"customId\";\n+ static final String KEY_FCM_SENDER_ID = \"fcmSenderId\";\nstatic final String KEY_CONFIG = \"config\";\nstatic final String KEY_C2A = \"wzrk_c2a\";\nstatic final String KEY_EFC = \"efc\";\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": "@@ -335,6 +335,9 @@ class DeviceInfo {\nreturn ManifestInfo.getInstance(this.context).getGCMSenderId();\n}\n+ String getFCMSenderID(){\n+ return ManifestInfo.getInstance(this.context).getFCMSenderId();\n+ }\nBoolean isWifiConnected() {\nBoolean ret = null;\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": "@@ -19,6 +19,7 @@ class ManifestInfo {\nprivate static boolean backgroundSync;\nprivate static boolean useCustomID;\nprivate static boolean raiseNotificationViewed;\n+ private static String fcmSenderId;\nprivate static String _getManifestStringValueForKey(Bundle manifest, String name) {\ntry {\n@@ -59,6 +60,7 @@ class ManifestInfo {\nbackgroundSync = \"1\".equals(_getManifestStringValueForKey(metaData,Constants.LABEL_BACKGROUND_SYNC));\nuseCustomID = \"1\".equals(_getManifestStringValueForKey(metaData,Constants.LABEL_CUSTOM_ID));\nraiseNotificationViewed = \"1\".equals(_getManifestStringValueForKey(metaData,Constants.LABEL_RAISE_NOTIFICATION_VIEWED));\n+ fcmSenderId = _getManifestStringValueForKey(metaData, Constants.LABEL_FCM_SENDER_ID);\n}\nsynchronized static ManifestInfo getInstance(Context context){\n@@ -84,6 +86,10 @@ class ManifestInfo {\nreturn gcmSenderId;\n}\n+ String getFCMSenderId() {\n+ return fcmSenderId;\n+ }\n+\nboolean useGoogleAdId(){\nreturn useADID;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Add ability to fetch FCM token using specific sender id |
116,623 | 01.04.2019 11:38:49 | -19,080 | 353a881766a0abfad97cd145c199f0cd9062e490 | Refactoring orientation changes | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNativeCoverFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNativeCoverFragment.java",
"diff": "@@ -39,11 +39,22 @@ public class CTInAppNativeCoverFragment extends CTInAppBaseFullNativeFragment {\ninAppButtons.add(mainButton);\nButton secondaryButton = linearLayout.findViewById(R.id.cover_button2);\ninAppButtons.add(secondaryButton);\n-\n- Bitmap image = inAppNotification.getImage();\n- if (image != null) {\nImageView imageView = relativeLayout.findViewById(R.id.backgroundImage);\n+ switch (currentOrientation){\n+ case Configuration.ORIENTATION_PORTRAIT:\n+ if(inAppNotification.getImage()!=null) {\nimageView.setImageBitmap(inAppNotification.getImage());\n+ imageView.setTag(0);\n+ imageView.setOnClickListener(new CTInAppNativeButtonClickListener());\n+ }\n+ break;\n+ case Configuration.ORIENTATION_LANDSCAPE:\n+ if(inAppNotification.getLandscapeImage()!=null) {\n+ imageView.setImageBitmap(inAppNotification.getLandscapeImage());\n+ imageView.setTag(0);\n+ imageView.setOnClickListener(new CTInAppNativeButtonClickListener());\n+ }\n+ break;\n}\nTextView textView1 = relativeLayout.findViewById(R.id.cover_title);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNativeCoverImageFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNativeCoverImageFragment.java",
"diff": "package com.clevertap.android.sdk;\nimport android.annotation.SuppressLint;\n+import android.content.res.Configuration;\nimport android.graphics.Color;\nimport android.os.Bundle;\nimport android.support.annotation.Nullable;\n@@ -22,11 +23,23 @@ public class CTInAppNativeCoverImageFragment extends CTInAppBaseFullFragment {\nRelativeLayout relativeLayout = fl.findViewById(R.id.cover_image_relative_layout);\nImageView imageView = relativeLayout.findViewById(R.id.cover_image);\n+ switch (currentOrientation){\n+ case Configuration.ORIENTATION_PORTRAIT:\nif(inAppNotification.getImage()!=null) {\nimageView.setImageBitmap(inAppNotification.getImage());\nimageView.setTag(0);\nimageView.setOnClickListener(new CTInAppNativeButtonClickListener());\n}\n+ break;\n+ case Configuration.ORIENTATION_LANDSCAPE:\n+ if(inAppNotification.getLandscapeImage()!=null) {\n+ imageView.setImageBitmap(inAppNotification.getLandscapeImage());\n+ imageView.setTag(0);\n+ imageView.setOnClickListener(new CTInAppNativeButtonClickListener());\n+ }\n+ break;\n+ }\n+\n@SuppressLint(\"ResourceType\")\nCloseImageView closeImageView = fl.findViewById(199272);\n"
},
{
"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": "@@ -46,7 +46,10 @@ public class CTInAppNativeHalfInterstitialFragment extends CTInAppBaseFullNative\n@SuppressLint(\"ResourceType\") final CloseImageView closeImageView = fl.findViewById(199272);\nrelativeLayout = fl.findViewById(R.id.half_interstitial_relative_layout);\n- if(currentOrientation == Configuration.ORIENTATION_PORTRAIT) {\n+ relativeLayout.setBackgroundColor(Color.parseColor(inAppNotification.getBackgroundColor()));\n+\n+ switch (currentOrientation){\n+ case Configuration.ORIENTATION_PORTRAIT:\nrelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n@@ -76,7 +79,12 @@ public class CTInAppNativeHalfInterstitialFragment extends CTInAppBaseFullNative\n}\n}\n});\n- }else if (currentOrientation == Configuration.ORIENTATION_LANDSCAPE){\n+ if (inAppNotification.getImage() != null) {\n+ ImageView imageView = relativeLayout.findViewById(R.id.backgroundImage);\n+ imageView.setImageBitmap(inAppNotification.getImage());\n+ }\n+ break;\n+ case Configuration.ORIENTATION_LANDSCAPE:\nrelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n@@ -106,22 +114,21 @@ public class CTInAppNativeHalfInterstitialFragment extends CTInAppBaseFullNative\n}\n}\n});\n+ if (inAppNotification.getLandscapeImage() != null) {\n+ ImageView imageView = relativeLayout.findViewById(R.id.backgroundImage);\n+ imageView.setImageBitmap(inAppNotification.getLandscapeImage());\n}\n- relativeLayout.setBackgroundColor(Color.parseColor(inAppNotification.getBackgroundColor()));\n+ break;\n+\n+ }\n+\n+\nLinearLayout linearLayout = relativeLayout.findViewById(R.id.half_interstitial_linear_layout);\nButton mainButton = linearLayout.findViewById(R.id.half_interstitial_button1);\ninAppButtons.add(mainButton);\nButton secondaryButton = linearLayout.findViewById(R.id.half_interstitial_button2);\ninAppButtons.add(secondaryButton);\n-\n- Bitmap image = inAppNotification.getImage();\n- if (image != null) {\n- ImageView imageView = relativeLayout.findViewById(R.id.backgroundImage);\n- imageView.setImageBitmap(inAppNotification.getImage());\n- }\n-\n-\nTextView textView1 = relativeLayout.findViewById(R.id.half_interstitial_title);\ntextView1.setText(inAppNotification.getTitle());\ntextView1.setTextColor(Color.parseColor(inAppNotification.getTitleColor()));\n"
},
{
"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": "@@ -38,7 +38,10 @@ public class CTInAppNativeHalfInterstitialImageFragment extends CTInAppBaseFullF\nfl.setBackgroundDrawable(new ColorDrawable(0xBB000000));\nrelativeLayout = fl.findViewById(R.id.half_interstitial_image_relative_layout);\n- if(currentOrientation == Configuration.ORIENTATION_PORTRAIT) {\n+ relativeLayout.setBackgroundColor(Color.parseColor(inAppNotification.getBackgroundColor()));\n+ ImageView imageView = relativeLayout.findViewById(R.id.half_interstitial_image);\n+ switch (currentOrientation){\n+ case Configuration.ORIENTATION_PORTRAIT:\nrelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n@@ -68,7 +71,13 @@ public class CTInAppNativeHalfInterstitialImageFragment extends CTInAppBaseFullF\n}\n}\n});\n- }else if (currentOrientation == Configuration.ORIENTATION_LANDSCAPE){\n+ if(inAppNotification.getImage()!=null) {\n+ imageView.setImageBitmap(inAppNotification.getImage());\n+ imageView.setTag(0);\n+ imageView.setOnClickListener(new CTInAppNativeButtonClickListener());\n+ }\n+ break;\n+ case Configuration.ORIENTATION_LANDSCAPE:\nrelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n@@ -98,14 +107,14 @@ public class CTInAppNativeHalfInterstitialImageFragment extends CTInAppBaseFullF\n}\n}\n});\n- }\n- relativeLayout.setBackgroundColor(Color.parseColor(inAppNotification.getBackgroundColor()));\n- ImageView imageView = relativeLayout.findViewById(R.id.half_interstitial_image);\n- if(inAppNotification.getImage()!=null) {\n- imageView.setImageBitmap(inAppNotification.getImage());\n+ if(inAppNotification.getLandscapeImage()!=null) {\n+ imageView.setImageBitmap(inAppNotification.getLandscapeImage());\nimageView.setTag(0);\nimageView.setOnClickListener(new CTInAppNativeButtonClickListener());\n}\n+ break;\n+\n+ }\ncloseImageView.setOnClickListener(new View.OnClickListener() {\n@Override\n"
},
{
"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": "@@ -78,10 +78,11 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\n@SuppressLint(\"ResourceType\")\nfinal CloseImageView closeImageView = fl.findViewById(199272);\n-\nrelativeLayout = fl.findViewById(R.id.interstitial_relative_layout);\n+ relativeLayout.setBackgroundColor(Color.parseColor(inAppNotification.getBackgroundColor()));\n- if(currentOrientation == Configuration.ORIENTATION_PORTRAIT) {\n+ switch (currentOrientation){\n+ case Configuration.ORIENTATION_PORTRAIT:\nrelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n@@ -113,7 +114,34 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\n}\n}\n});\n- }else if(currentOrientation == Configuration.ORIENTATION_LANDSCAPE){\n+ if (inAppNotification.mediaIsImage()) {\n+ Bitmap image = inAppNotification.getImage();\n+ if (image != null) {\n+ ImageView imageView = relativeLayout.findViewById(R.id.backgroundImage);\n+ imageView.setVisibility(View.VISIBLE);\n+ imageView.setImageBitmap(inAppNotification.getImage());\n+ }\n+ }\n+ else if (inAppNotification.mediaIsGIF()) {\n+ if (inAppNotification.getGifByteArray() != null) {\n+ gifImageView = relativeLayout.findViewById(R.id.gifImage);\n+ gifImageView.setVisibility(View.VISIBLE);\n+ gifImageView.setBytes(inAppNotification.getGifByteArray());\n+ gifImageView.startAnimation();\n+ }\n+ }\n+ else if (inAppNotification.mediaIsVideo()) {\n+ initFullScreenDialog();\n+ prepareMedia();\n+ playMedia();\n+ }\n+ else if (inAppNotification.mediaIsAudio()) {\n+ prepareMedia();\n+ playMedia();\n+ disableFullScreenButton();\n+ }\n+ break;\n+ case Configuration.ORIENTATION_LANDSCAPE:\nrelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n@@ -145,29 +173,19 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\n}\n}\n});\n- }\n-\n- relativeLayout.setBackgroundColor(Color.parseColor(inAppNotification.getBackgroundColor()));\n-\n- LinearLayout linearLayout = relativeLayout.findViewById(R.id.interstitial_linear_layout);\n- Button mainButton = linearLayout.findViewById(R.id.interstitial_button1);\n- inAppButtons.add(mainButton);\n- Button secondaryButton = linearLayout.findViewById(R.id.interstitial_button2);\n- inAppButtons.add(secondaryButton);\n-\nif (inAppNotification.mediaIsImage()) {\n- Bitmap image = inAppNotification.getImage();\n+ Bitmap image = inAppNotification.getLandscapeImage();\nif (image != null) {\nImageView imageView = relativeLayout.findViewById(R.id.backgroundImage);\nimageView.setVisibility(View.VISIBLE);\n- imageView.setImageBitmap(inAppNotification.getImage());\n+ imageView.setImageBitmap(inAppNotification.getLandscapeImage());\n}\n}\nelse if (inAppNotification.mediaIsGIF()) {\n- if (inAppNotification.getGifByteArray() != null) {\n+ if (inAppNotification.getLandscapeGifByteArray() != null) {\ngifImageView = relativeLayout.findViewById(R.id.gifImage);\ngifImageView.setVisibility(View.VISIBLE);\n- gifImageView.setBytes(inAppNotification.getGifByteArray());\n+ gifImageView.setBytes(inAppNotification.getLandscapeGifByteArray());\ngifImageView.startAnimation();\n}\n}\n@@ -181,7 +199,14 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nplayMedia();\ndisableFullScreenButton();\n}\n+ break;\n+ }\n+ LinearLayout linearLayout = relativeLayout.findViewById(R.id.interstitial_linear_layout);\n+ Button mainButton = linearLayout.findViewById(R.id.interstitial_button1);\n+ inAppButtons.add(mainButton);\n+ Button secondaryButton = linearLayout.findViewById(R.id.interstitial_button2);\n+ inAppButtons.add(secondaryButton);\nTextView textView1 = relativeLayout.findViewById(R.id.interstitial_title);\ntextView1.setText(inAppNotification.getTitle());\n@@ -316,8 +341,13 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\npublic void onStart() {\nsuper.onStart();\nif(gifImageView != null){\n+ if(currentOrientation == Configuration.ORIENTATION_PORTRAIT) {\ngifImageView.setBytes(inAppNotification.getGifByteArray());\ngifImageView.startAnimation();\n+ }else if(currentOrientation == Configuration.ORIENTATION_LANDSCAPE){\n+ gifImageView.setBytes(inAppNotification.getLandscapeGifByteArray());\n+ gifImageView.startAnimation();\n+ }\n}\n}\n"
},
{
"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": "@@ -38,8 +38,12 @@ public class CTInAppNativeInterstitialImageFragment extends CTInAppBaseFullFragm\n@SuppressLint(\"ResourceType\")\nfinal CloseImageView closeImageView = fl.findViewById(199272);\n- if(currentOrientation == Configuration.ORIENTATION_PORTRAIT) {\nrelativeLayout = fl.findViewById(R.id.interstitial_image_relative_layout);\n+ relativeLayout.setBackgroundColor(Color.parseColor(inAppNotification.getBackgroundColor()));\n+ ImageView imageView = relativeLayout.findViewById(R.id.interstitial_image);\n+\n+ switch (currentOrientation){\n+ case Configuration.ORIENTATION_PORTRAIT:\nrelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n@@ -69,7 +73,13 @@ public class CTInAppNativeInterstitialImageFragment extends CTInAppBaseFullFragm\n}\n}\n});\n- }else if(currentOrientation == Configuration.ORIENTATION_LANDSCAPE){\n+ if(inAppNotification.getImage()!=null) {\n+ imageView.setImageBitmap(inAppNotification.getImage());\n+ imageView.setTag(0);\n+ imageView.setOnClickListener(new CTInAppNativeButtonClickListener());\n+ }\n+ break;\n+ case Configuration.ORIENTATION_LANDSCAPE:\nrelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n@@ -89,8 +99,6 @@ public class CTInAppNativeInterstitialImageFragment extends CTInAppBaseFullFragm\ncloseImageView.setLayoutParams(closeLp);\n} else {\nlayoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth() * 0.5625f);\n- Logger.d(\"Layout height = \" + layoutHeight);\n- Logger.d(\"Layout width = \" + relativeLayout1.getMeasuredWidth());\nrelativeLayout1.setLayoutParams(layoutParams);\n}\n}\n@@ -101,15 +109,13 @@ public class CTInAppNativeInterstitialImageFragment extends CTInAppBaseFullFragm\n}\n}\n});\n- }\n-\n- relativeLayout.setBackgroundColor(Color.parseColor(inAppNotification.getBackgroundColor()));\n- ImageView imageView = relativeLayout.findViewById(R.id.interstitial_image);\n- if(inAppNotification.getImage()!=null) {\n- imageView.setImageBitmap(inAppNotification.getImage());\n+ if(inAppNotification.getLandscapeImage()!=null) {\n+ imageView.setImageBitmap(inAppNotification.getLandscapeImage());\nimageView.setTag(0);\nimageView.setOnClickListener(new CTInAppNativeButtonClickListener());\n}\n+ break;\n+ }\ncloseImageView.setOnClickListener(new View.OnClickListener() {\n@Override\n"
},
{
"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": "@@ -37,6 +37,7 @@ class CTInAppNotification implements Parcelable {\nprivate String imageUrl;\nprivate String _imageCacheKey;\nprivate String contentType;\n+ private String landscapeContentType;\nprivate String mediaUrl;\nprivate String title;\n@@ -156,8 +157,8 @@ class CTInAppNotification implements Parcelable {\nthis.inAppType = CTInAppType.fromString(this.type);\nthis.isTablet = jsonObject.has(Constants.KEY_IS_TABLET) && jsonObject.getBoolean(Constants.KEY_IS_TABLET);\nthis.backgroundColor = jsonObject.has(Constants.KEY_BG) ? jsonObject.getString(Constants.KEY_BG) : Constants.WHITE;\n- this.isPortrait = !jsonObject.has(\"isPortrait\") || jsonObject.getBoolean(\"isPortrait\");\n- this.isLandscape = jsonObject.has(\"isLandscape\") && jsonObject.getBoolean(\"isLandscape\");\n+ this.isPortrait = !jsonObject.has(\"handle_portrait\") || jsonObject.getBoolean(\"handle_portrait\");\n+ this.isLandscape = jsonObject.has(\"handle_landscape\") && jsonObject.getBoolean(\"handle_landscape\");\nJSONObject titleObject = jsonObject.has(Constants.KEY_TITLE) ? jsonObject.getJSONObject(Constants.KEY_TITLE) : null;\nif(titleObject != null) {\nthis.title = titleObject.has(Constants.KEY_TEXT) ? titleObject.getString(Constants.KEY_TEXT) : \"\";\n@@ -186,6 +187,24 @@ class CTInAppNotification implements Parcelable {\n}\n}\n}\n+\n+ JSONObject media_landscape = jsonObject.has(\"media_landscape\") ? jsonObject.getJSONObject(\"media_landscape\") : null;\n+ if(media_landscape!=null){\n+ this.landscapeContentType = media_landscape.has(Constants.KEY_CONTENT_TYPE) ? media_landscape.getString(Constants.KEY_CONTENT_TYPE) : \"\";\n+ String mediaUrl = media_landscape.has(\"url_landscape\") ? media_landscape.getString(\"url_landscape\") : \"\";\n+ if(!mediaUrl.isEmpty()){\n+ if(this.landscapeContentType.startsWith(\"image\")){\n+ this.landscapeImageUrl = mediaUrl;\n+ if(media_landscape.has(\"key\")){\n+ this._landscapeImageCacheKey = UUID.randomUUID().toString() + media_landscape.getString(\"key\");\n+ }else {\n+ this._landscapeImageCacheKey = UUID.randomUUID().toString();\n+ }\n+ } else {\n+ this.mediaUrl = mediaUrl;\n+ }\n+ }\n+ }\nJSONArray buttonArray = jsonObject.has(Constants.KEY_BUTTONS) ? jsonObject.getJSONArray(Constants.KEY_BUTTONS) : null;\nif(buttonArray != null) {\nfor (int i = 0; i < buttonArray.length(); i++) {\n@@ -228,10 +247,22 @@ class CTInAppNotification implements Parcelable {\nif (this.mediaIsGIF()) {\nGifCache.init();\n+ if(this.isPortrait() && this.isLandscape()) {\n+ if (this.getGifByteArray() != null && this.getLandscapeGifByteArray() != null) {\n+ listener.notificationReady(this);\n+ return;\n+ }\n+ }else if(this.isPortrait()){\nif (this.getGifByteArray() != null) {\nlistener.notificationReady(this);\nreturn;\n}\n+ } else if(this.isLandscape()){\n+ if (this.getLandscapeGifByteArray() != null) {\n+ listener.notificationReady(this);\n+ return;\n+ }\n+ }\nLogger.v(\"CTInAppNotification: downloading GIF :\" + this.imageUrl);\nbyte[] gifByteArray = Utils.getByteArrayFromImageURL(this.imageUrl);\nif(gifByteArray != null){\n@@ -239,14 +270,35 @@ class CTInAppNotification implements Parcelable {\nif(!GifCache.addByteArray(this.getImageCacheKey(), gifByteArray)){\nthis.error = \"Error processing GIF\";\n}\n- listener.notificationReady(this);\n}\n+ Logger.v(\"CTInAppNotification: downloading GIF for landscape:\" + this.landscapeImageUrl);\n+ byte[] gifLandscapeByteArray = Utils.getByteArrayFromImageURL(this.landscapeImageUrl);\n+ if(gifLandscapeByteArray != null){\n+ Logger.v(\"GIF Downloaded from url: \" + this.landscapeImageUrl);\n+ if(!GifCache.addByteArray(this.getLandscapeImageCacheKey(), gifLandscapeByteArray)){\n+ this.error = \"Error processing GIF\";\n+ }\n+ }\n+ listener.notificationReady(this);\n+\n} else if (this.mediaIsImage()) {\nImageCache.init();\n+ if(this.isPortrait() && this.isLandscape()) {\n+ if (this.getImage() != null && this.getLandscapeImage() !=null) {\n+ listener.notificationReady(this);\n+ return;\n+ }\n+ }else if(this.isPortrait()){\nif (this.getImage() != null) {\nlistener.notificationReady(this);\nreturn;\n}\n+ } else if(this.isLandscape()){\n+ if (this.getLandscapeImage() !=null) {\n+ listener.notificationReady(this);\n+ return;\n+ }\n+ }\nLogger.v(\"CTInAppNotification: downloading Image :\" + this.imageUrl);\nBitmap imageBitmap = Utils.getBitmapFromURL(this.imageUrl);\nif (imageBitmap != null) {\n@@ -254,8 +306,18 @@ class CTInAppNotification implements Parcelable {\nif (!ImageCache.addBitmap(this.getImageCacheKey(), imageBitmap)) {\nthis.error = \"Error processing image\";\n}\n- listener.notificationReady(this);\n}\n+\n+ Logger.v(\"CTInAppNotification: downloading Image for landscape:\" + this.landscapeImageUrl);\n+ Bitmap imageLandscapeBitmap = Utils.getBitmapFromURL(this.landscapeImageUrl);\n+ if (imageLandscapeBitmap != null) {\n+ Logger.v(\"Image Downloaded from url: \" + this.landscapeImageUrl);\n+ if (!ImageCache.addBitmap(this.getLandscapeImageCacheKey(), imageLandscapeBitmap)) {\n+ this.error = \"Error processing image\";\n+ }\n+ }\n+\n+ listener.notificationReady(this);\n} else if(this.mediaIsVideo() || this.mediaIsAudio()){\nif (!this.videoSupported) {\nthis.error = \"InApp Video/Audio is not supported\";\n@@ -488,14 +550,26 @@ class CTInAppNotification implements Parcelable {\nreturn ImageCache.getBitmap(getImageCacheKey());\n}\n+ Bitmap getLandscapeImage(){\n+ return ImageCache.getBitmap(getLandscapeImageCacheKey());\n+ }\n+\nbyte[] getGifByteArray(){\nreturn GifCache.getByteArray(getImageCacheKey());\n}\n+ byte[] getLandscapeGifByteArray(){\n+ return GifCache.getByteArray(getLandscapeImageCacheKey());\n+ }\n+\nprivate String getImageCacheKey() {\nreturn this._imageCacheKey;\n}\n+ public String getLandscapeImageCacheKey() {\n+ return _landscapeImageCacheKey;\n+ }\n+\nvoid didDismiss() {\nremoveImageOrGif();\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": "@@ -1971,18 +1971,25 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nfinal String domainName = conn.getHeaderField(Constants.HEADER_DOMAIN_NAME);\n+ Logger.v(\"Getting domain from header - \" + domainName);\nif (domainName == null || domainName.trim().length() == 0) {\nreturn true;\n}\n-//TODO uncomment once Spiky backend changes are done\n-// final String spikyDomainName = conn.getHeaderField(Constants.SPIKY_HEADER_DOMAIN_NAME);\n+\n+ final String spikyDomainName = conn.getHeaderField(Constants.SPIKY_HEADER_DOMAIN_NAME);\n+ Logger.v(\"Getting spiky domain from header - \" + spikyDomainName);\n// if (spikyDomainName == null || spikyDomainName.trim().length() == 0) {\n// return true;\n// }\nsetMuted(context, false);\nsetDomain(context, domainName);\n- //setSpikyDomain(context,spikyDomainName);\n+ Logger.v(\"Setting spiky domain from header as -\" + spikyDomainName);\n+ if (spikyDomainName == null) {\n+ setSpikyDomain(context,domainName);\n+ } else {\n+ setSpikyDomain(context, spikyDomainName);\n+ }\nreturn true;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -63,6 +63,24 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nreturn;\n}\n+ //Allow rotation for all InApps if Landscape version is present\n+ if (inAppNotification.isPortrait() && !inAppNotification.isLandscape()) {\n+ try {\n+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);\n+ } catch (Throwable t) {\n+ Logger.d(\"Error displaying InAppNotification\", t);\n+ int orientation = this.getResources().getConfiguration().orientation;\n+ if (orientation == Configuration.ORIENTATION_LANDSCAPE) {\n+ Logger.d(\"App in Landscape, dismissing portrait InApp Notification\");\n+ finish();\n+ didDismiss(null);\n+ return;\n+ } else {\n+ Logger.d(\"App in Portrait, displaying InApp Notification anyway\");\n+ }\n+ }\n+ }\n+\nCTInAppBaseFullFragment contentFragment;\nif (savedInstanceState == null) {\ncontentFragment = createContentFragment();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Refactoring orientation changes |
116,623 | 02.04.2019 17:57:26 | -19,080 | 46cab102fdb457f0dd0bc6eb2f12cbc6ee5028d9 | Updates to inbox landscape layouts and raising Notif Viewed only for PNs | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTCarouselMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTCarouselMessageViewHolder.java",
"diff": "@@ -32,9 +32,9 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\ntitle = itemView.findViewById(R.id.messageTitle);\nmessage = itemView.findViewById(R.id.messageText);\ntimestamp = itemView.findViewById(R.id.timestamp);\n- carouselTimestamp = itemView.findViewById(R.id.carousel_timestamp);\n+ //carouselTimestamp = itemView.findViewById(R.id.carousel_timestamp);\nreadDot = itemView.findViewById(R.id.read_circle);\n- carouselReadDot = itemView.findViewById(R.id.carousel_read_circle);\n+ //carouselReadDot = itemView.findViewById(R.id.carousel_read_circle);\nclickLayout = itemView.findViewById(R.id.body_relative_layout);\n}\n@@ -45,29 +45,29 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\n// noinspection ConstantConditions\nfinal Context appContext = parent.getActivity().getApplicationContext();\nCTInboxMessageContent content = inboxMessage.getInboxMessageContents().get(0);\n- if (inboxMessage.getType() == CTInboxMessageType.CarouselImageMessage) {\n- this.title.setVisibility(View.GONE);\n- this.message.setVisibility(View.GONE);\n- this.carouselTimestamp.setVisibility(View.VISIBLE);\n- if(inboxMessage.isRead()){\n- this.carouselReadDot.setVisibility(View.GONE);\n- }else{\n- this.carouselReadDot.setVisibility(View.VISIBLE);\n- }\n- String carouselImageDisplayTimestamp = calculateDisplayTimestamp(inboxMessage.getDate());\n- this.carouselTimestamp.setText(carouselImageDisplayTimestamp);\n- this.carouselTimestamp.setTextColor(Color.parseColor(content.getTitleColor()));\n- this.timestamp.setVisibility(View.GONE);\n- this.readDot.setVisibility(View.GONE);\n- } else {\n+// if (inboxMessage.getType() == CTInboxMessageType.CarouselImageMessage) {\n+// this.title.setVisibility(View.GONE);\n+// this.message.setVisibility(View.GONE);\n+// this.carouselTimestamp.setVisibility(View.VISIBLE);\n+// if(inboxMessage.isRead()){\n+// this.carouselReadDot.setVisibility(View.GONE);\n+// }else{\n+// this.carouselReadDot.setVisibility(View.VISIBLE);\n+// }\n+// String carouselImageDisplayTimestamp = calculateDisplayTimestamp(inboxMessage.getDate());\n+// this.carouselTimestamp.setText(carouselImageDisplayTimestamp);\n+// this.carouselTimestamp.setTextColor(Color.parseColor(content.getTitleColor()));\n+// this.timestamp.setVisibility(View.GONE);\n+// this.readDot.setVisibility(View.GONE);\n+// } else {\nthis.title.setVisibility(View.VISIBLE);\nthis.message.setVisibility(View.VISIBLE);\nthis.title.setText(content.getTitle());\nthis.title.setTextColor(Color.parseColor(content.getTitleColor()));\nthis.message.setText(content.getMessage());\nthis.message.setTextColor(Color.parseColor(content.getMessageColor()));\n- this.carouselTimestamp.setVisibility(View.GONE);\n- this.carouselReadDot.setVisibility(View.GONE);\n+ //this.carouselTimestamp.setVisibility(View.GONE);\n+ //this.carouselReadDot.setVisibility(View.GONE);\nif(inboxMessage.isRead()){\nthis.readDot.setVisibility(View.GONE);\n}else{\n@@ -77,7 +77,7 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\nString carouselDisplayTimestamp = calculateDisplayTimestamp(inboxMessage.getDate());\nthis.timestamp.setText(carouselDisplayTimestamp);\nthis.timestamp.setTextColor(Color.parseColor(content.getTitleColor()));\n- }\n+ //}\nthis.clickLayout.setBackgroundColor(Color.parseColor(inboxMessage.getBgColor()));\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"diff": "@@ -145,7 +145,8 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nfinal Resources resources = context.getResources();\nint width;\nif(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE) {\n- width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, Constants.LIST_VIEW_WIDTH, resources.getDisplayMetrics());\n+ //width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, Constants.LIST_VIEW_WIDTH, resources.getDisplayMetrics());\n+ width = resources.getDisplayMetrics().widthPixels/2;\n}else {\nwidth = resources.getDisplayMetrics().widthPixels;\n}\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": "@@ -168,7 +168,8 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nint width;\nif(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE) {\n- width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, Constants.LIST_VIEW_WIDTH, resources.getDisplayMetrics());\n+ //width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, Constants.LIST_VIEW_WIDTH, resources.getDisplayMetrics());\n+ width = resources.getDisplayMetrics().widthPixels/2;\n}else {\nwidth = resources.getDisplayMetrics().widthPixels;\n}\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": "@@ -122,12 +122,12 @@ public class CTInboxListViewFragment extends Fragment {\nfinal LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity());\nfinal CTInboxMessageAdapter inboxMessageAdapter = new CTInboxMessageAdapter(inboxMessages, this);\n- if(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE){\n- int width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, Constants.LIST_VIEW_WIDTH, getResources().getDisplayMetrics());\n- LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(width, ViewGroup.LayoutParams.MATCH_PARENT);\n- layoutParams.gravity = Gravity.CENTER;\n- linearLayout.setLayoutParams(layoutParams);\n- }\n+// if(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE){\n+// int width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, Constants.LIST_VIEW_WIDTH, getResources().getDisplayMetrics());\n+// LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(width, ViewGroup.LayoutParams.MATCH_PARENT);\n+// layoutParams.gravity = Gravity.CENTER;\n+// linearLayout.setLayoutParams(layoutParams);\n+// }\nif (haveVideoPlayerSupport) {\nmediaRecyclerView = new MediaPlayerRecyclerView(getActivity());\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"diff": "@@ -31,6 +31,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nprivate TextView timestamp;\nprivate ImageView readDot;\nprivate Button cta1,cta2,cta3;\n+ private RelativeLayout mediaLayout;\nCTSimpleMessageViewHolder(@NonNull View itemView) {\n@@ -51,6 +52,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nctaLinearLayout = itemView.findViewById(R.id.cta_linear_layout);\nbodyRelativeLayout = itemView.findViewById(R.id.body_relative_layout);\nprogressBarFrameLayout = itemView.findViewById(R.id.simple_progress_frame_layout);\n+ mediaLayout = itemView.findViewById(R.id.media_layout);\n}\n@@ -143,11 +145,13 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.mediaImage.setBackgroundColor(Color.parseColor(inboxMessage.getBgColor()));\nthis.squareImage.setVisibility(View.GONE);\nthis.squareImage.setBackgroundColor(Color.parseColor(inboxMessage.getBgColor()));\n+ this.mediaLayout.setVisibility(View.GONE);\n//Set the height and width of Progress Bar Frame to match the thumbnail size\nfinal Resources resources = context.getResources();\nint width;\nif(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE) {\n- width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, Constants.LIST_VIEW_WIDTH, resources.getDisplayMetrics());\n+ //width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, Constants.LIST_VIEW_WIDTH, resources.getDisplayMetrics());\n+ width = resources.getDisplayMetrics().widthPixels/2;\n}else {\nwidth = resources.getDisplayMetrics().widthPixels;\n}\n@@ -158,6 +162,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nswitch (inboxMessage.getOrientation()) {\ncase \"l\":\nif (content.mediaIsImage()) {\n+ this.mediaLayout.setVisibility(View.VISIBLE);\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\nGlide.with(this.mediaImage.getContext())\n@@ -167,6 +172,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(this.mediaImage);\n} else if (content.mediaIsGIF()) {\n+ this.mediaLayout.setVisibility(View.VISIBLE);\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nGlide.with(this.mediaImage.getContext())\n@@ -178,6 +184,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.into(this.mediaImage);\n} else if (content.mediaIsVideo()) {\nif(!content.getPosterUrl().isEmpty()) {\n+ this.mediaLayout.setVisibility(View.VISIBLE);\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\nGlide.with(this.mediaImage.getContext())\n@@ -187,6 +194,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.error(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL)))\n.into(this.mediaImage);\n} else {\n+ this.mediaLayout.setVisibility(View.VISIBLE);\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\nint drawableId = Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL);\n@@ -197,6 +205,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}\n}\n}else if(content.mediaIsAudio()){\n+ this.mediaLayout.setVisibility(View.VISIBLE);\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\nthis.mediaImage.setBackgroundColor(getImageBackgroundColor());\n@@ -210,6 +219,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nbreak;\ncase \"p\":\nif (content.mediaIsImage()) {\n+ this.mediaLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\nGlide.with(this.squareImage.getContext())\n@@ -219,6 +229,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(this.squareImage);\n} else if (content.mediaIsGIF()) {\n+ this.mediaLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nGlide.with(this.squareImage.getContext())\n@@ -230,6 +241,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.into(this.squareImage);\n} else if (content.mediaIsVideo()) {\nif(!content.getPosterUrl().isEmpty()) {\n+ this.mediaLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nGlide.with(this.squareImage.getContext())\n@@ -239,6 +251,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.error(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL)))\n.into(this.squareImage);\n}else{\n+ this.mediaLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nint drawableId = Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL);\n@@ -249,6 +262,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}\n}\n}else if(content.mediaIsAudio()){\n+ this.mediaLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\nthis.squareImage.setBackgroundColor(getImageBackgroundColor());\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": "@@ -1460,15 +1460,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (isMuted()) {\nreturn;\n}\n- try {\n- if(event.has(\"evtName\")) {\n- if (event.getString(\"evtName\").equals(Constants.NOTIFICATION_VIEWED_EVENT_NAME))\n- processPushNotificationViewedEvent(context, event, eventType);\n- else\n- processEvent(context, event, eventType);\n+ if (eventType == Constants.NV_EVENT) {\n+ getConfigLogger().verbose(getAccountId(),\"Pushing Notification Viewed event onto separate queue\");\n+ processPushNotificationViewedEvent(context, event, Constants.RAISED_EVENT);\n}\n- }catch (JSONException e){\n- getConfigLogger().verbose(getAccountId(),\"Couldn't parse event JSON : \" + e.getLocalizedMessage());\n+ else {\n+ processEvent(context, event, eventType);\n}\n}\n@@ -1945,7 +1942,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nif (emptyDomain) {\n- domain = Constants.PRIMARY_DOMAIN + \"/hello\";\n+ domain = \"eu1.\"+Constants.PRIMARY_DOMAIN + \"/hello\";\n} else {\ndomain += \"/a1\";\n}\n@@ -4566,7 +4563,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n} catch (Throwable ignored) {\n//no-op\n}\n- queueEvent(context, event, Constants.RAISED_EVENT);\n+ queueEvent(context, event, Constants.NV_EVENT);\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": "@@ -30,6 +30,7 @@ public class Constants {\nstatic final int PROFILE_EVENT = 3;\nstatic final int RAISED_EVENT = 4;\nstatic final int DATA_EVENT = 5;\n+ static final int NV_EVENT = 6;\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"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_carousel_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_carousel_layout.xml",
"diff": "android:orientation=\"vertical\"\nandroid:layout_height=\"wrap_content\"\nandroid:baselineAligned=\"false\">\n+ <LinearLayout\n+ android:layout_width=\"wrap_content\"\n+ android:id=\"@+id/carousel_linear_layout\"\n+ android:layout_marginLeft=\"160dp\"\n+ android:layout_marginRight=\"160dp\"\n+ android:layout_marginStart=\"160dp\"\n+ android:layout_marginEnd=\"160dp\"\n+ android:layout_above=\"@id/timestamp_relative_layout\"\n+ android:layout_height=\"wrap_content\">\n<com.clevertap.android.sdk.CTCarouselViewPager\nandroid:id=\"@+id/image_carousel_viewpager\"\n- android:layout_width=\"match_parent\"\n+ android:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\" />\n+ </LinearLayout>\n<RelativeLayout\nandroid:layout_width=\"match_parent\"\n- android:layout_below=\"@+id/image_carousel_viewpager\"\n+ android:layout_alignParentBottom=\"true\"\n+ android:id=\"@+id/timestamp_relative_layout\"\nandroid:layout_height=\"wrap_content\">\n<LinearLayout\nandroid:id=\"@+id/sliderDots\"\nandroid:layout_centerHorizontal=\"true\"\nandroid:layout_marginTop=\"6dp\"\nandroid:layout_height=\"wrap_content\">\n- <ImageView\n- android:id=\"@+id/read_circle1\"\n- android:src=\"@drawable/read_circle\"\n- android:layout_width=\"wrap_content\"\n- android:layout_height=\"wrap_content\" />\n</LinearLayout>\n<LinearLayout\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_alignParentRight=\"true\">\n<TextView\n- android:id=\"@+id/timestamp1\"\n+ android:id=\"@+id/carousel_timestamp\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_marginEnd=\"10dp\"\nandroid:text=\"timestamp\"\nandroid:textColor=\"@android:color/darker_gray\" />\n<ImageView\n- android:id=\"@+id/read_circle\"\n+ android:id=\"@+id/carousel_read_circle\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_gravity=\"center\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_carousel_text_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_carousel_text_layout.xml",
"diff": "<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\nandroid:orientation=\"vertical\" android:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\">\n- <LinearLayout\n+ <RelativeLayout\n+ android:layout_width=\"wrap_content\"\nandroid:id=\"@+id/body_relative_layout\"\n+ android:layout_height=\"wrap_content\">\n+ <LinearLayout\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:weightSum=\"2\"\n+ android:id=\"@+id/template_layout\"\nandroid:baselineAligned=\"false\">\n- <RelativeLayout\n- android:id=\"@+id/media_layout\"\n- android:layout_width=\"match_parent\"\n- android:layout_height=\"wrap_content\"\n- android:layout_weight=\"1\">\n<com.clevertap.android.sdk.CTCarouselViewPager\nandroid:id=\"@+id/image_carousel_viewpager\"\nandroid:layout_width=\"match_parent\"\n+ android:layout_weight=\"1\"\nandroid:layout_height=\"wrap_content\" />\n- </RelativeLayout>\n+\n<RelativeLayout\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_alignParentRight=\"true\">\n<TextView\n- android:id=\"@+id/timestamp1\"\n+ android:id=\"@+id/timestamp\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_marginEnd=\"10dp\"\nandroid:layout_height=\"44dp\"\nandroid:background=\"@android:color/white\"\nandroid:orientation=\"horizontal\"\n+ android:layout_below=\"@+id/template_layout\"\nandroid:weightSum=\"6\">\n<Button\nandroid:textSize=\"14sp\"\nandroid:visibility=\"gone\" />\n</LinearLayout>\n+ </RelativeLayout>\n</LinearLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_icon_message_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_icon_message_layout.xml",
"diff": "android:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\">\n+ <RelativeLayout\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:id=\"@+id/click_relative_layout\">\n<LinearLayout\nandroid:id=\"@+id/body_relative_layout\"\nandroid:layout_width=\"match_parent\"\nandroid:id=\"@+id/icon_message_frame_layout\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- android:visibility=\"gone\"></FrameLayout>\n+ android:visibility=\"gone\"/>\n<FrameLayout\nandroid:id=\"@+id/icon_progress_frame_layout\"\nandroid:textColor=\"@android:color/darker_gray\" />\n</RelativeLayout>\n</LinearLayout>\n-\n<LinearLayout\nandroid:id=\"@+id/timestamp_linear_layout\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- android:layout_above=\"@id/cta_linear_layout\"\n+ android:layout_marginTop=\"-20dp\"\n+ android:layout_below=\"@id/body_relative_layout\"\nandroid:gravity=\"end\"\nandroid:orientation=\"horizontal\">\nandroid:layout_marginRight=\"20dp\"\nandroid:src=\"@drawable/read_circle\" />\n</LinearLayout>\n+ </RelativeLayout>\n+\n<LinearLayout\nandroid:id=\"@+id/cta_linear_layout\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"44dp\"\n- android:layout_below=\"@+id/body_relative_layout\"\n+ android:layout_below=\"@+id/click_relative_layout\"\nandroid:background=\"@android:color/white\"\nandroid:orientation=\"horizontal\"\n+ android:visibility=\"visible\"\nandroid:weightSum=\"6\">\n<Button\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_simple_message_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_simple_message_layout.xml",
"diff": "android:id=\"@+id/simple_message_relative_layout\">\n<RelativeLayout\nandroid:id=\"@+id/click_relative_layout\"\n- android:layout_width=\"match_parent\"\n+ android:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\">\n+ <LinearLayout\n+ android:orientation=\"horizontal\"\n+ android:weightSum=\"2\"\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:baselineAligned=\"false\">\n<RelativeLayout\nandroid:id=\"@+id/media_layout\"\n+ android:layout_weight=\"1\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\">\n<com.clevertap.android.sdk.RectangleImageView\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:orientation=\"vertical\"\n- android:background=\"@android:color/white\"\n- android:layout_below=\"@+id/media_layout\">\n+ android:layout_weight=\"1\"\n+ android:background=\"@android:color/white\">\n<TextView\nandroid:id=\"@+id/messageTitle\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_below=\"@+id/timestamp_linear_layout\"\nandroid:background=\"@android:color/darker_gray\"/>\n</RelativeLayout>\n+ </LinearLayout>\n</RelativeLayout>\n<LinearLayout\nandroid:id=\"@+id/cta_linear_layout\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Updates to inbox landscape layouts and raising Notif Viewed only for PNs |
116,623 | 03.04.2019 16:15:35 | -19,080 | e6705ec18c86d8111c45d5a4a424813002877042 | Added ability to request FCM tokens with specific Sender 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": "@@ -44,6 +44,8 @@ import com.google.android.gms.gcm.GoogleCloudMessaging;\nimport com.google.android.gms.iid.InstanceID;\nimport com.google.android.gms.plus.model.people.Person;\nimport com.google.firebase.iid.FirebaseInstanceId;\n+import com.google.firebase.messaging.FirebaseMessaging;\n+\nimport org.json.JSONArray;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n@@ -719,6 +721,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//Push\nprivate void doFCMRefresh() {\n+ final DeviceInfo _deviceInfo = this.deviceInfo;\npostAsyncSafely(\"FcmManager#doFCMRefresh\", new Runnable() {\n@Override\npublic void run() {\n@@ -728,7 +731,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn;\n}\n- String freshToken = FCMGetFreshToken();\n+ String freshToken = FCMGetFreshToken(_deviceInfo.getFCMSenderID());\nif (freshToken == null) return;\ncacheFCMToken(freshToken);\n@@ -783,11 +786,16 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* request token from FCM\n*/\n- private String FCMGetFreshToken() {\n- getConfigLogger().verbose(getAccountId(), \"FcmManager: Requesting a FCM token\");\n+ private String FCMGetFreshToken(final String senderId) {\nString token = null;\ntry {\n+ if(senderId != null){\n+ getConfigLogger().verbose(getAccountId(), \"FcmManager: Requesting a FCM token with Sender Id - \"+senderId);\n+ token = FirebaseInstanceId.getInstance().getToken(senderId, FirebaseMessaging.INSTANCE_ID_SCOPE);\n+ }else {\n+ getConfigLogger().verbose(getAccountId(), \"FcmManager: Requesting a FCM token\");\ntoken = FirebaseInstanceId.getInstance().getToken();\n+ }\ngetConfigLogger().info(getAccountId(),\"FCM token: \"+token);\n} catch (Throwable t) {\ngetConfigLogger().verbose(getAccountId(), \"FcmManager: Error requesting FCM token\", t);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"diff": "@@ -23,6 +23,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nprivate boolean createdPostAppLaunch;\nprivate boolean sslPinning;\nprivate boolean backgroundSync;\n+ private String fcmSenderId;\nprivate CleverTapInstanceConfig(Context context, String accountId, String accountToken, String accountRegion, boolean isDefault){\nthis.accountId = accountId;\n@@ -41,6 +42,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.gcmSenderId = manifest.getGCMSenderId();\nthis.sslPinning = manifest.isSSLPinningEnabled();\nthis.backgroundSync = manifest.isBackgroundSync();\n+ this.fcmSenderId = manifest.getFCMSenderId();\n}\nCleverTapInstanceConfig(CleverTapInstanceConfig config){\n@@ -58,6 +60,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.createdPostAppLaunch = config.createdPostAppLaunch;\nthis.sslPinning = config.sslPinning;\nthis.backgroundSync = config.backgroundSync;\n+ this.fcmSenderId = config.fcmSenderId;\n}\nprivate CleverTapInstanceConfig(String jsonString) throws Throwable {\n@@ -91,6 +94,8 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.sslPinning = configJsonObject.getBoolean(\"sslPinning\");\nif(configJsonObject.has(\"backgroundSync\"))\nthis.backgroundSync = configJsonObject.getBoolean(\"backgroundSync\");\n+ if(configJsonObject.has(\"fcmSenderId\"))\n+ this.fcmSenderId = configJsonObject.getString(\"fcmSenderId\");\n} catch (Throwable t){\nLogger.v(\"Error constructing CleverTapInstanceConfig from JSON: \" + jsonString +\": \", t.getCause());\nthrow(t);\n@@ -111,6 +116,7 @@ public class CleverTapInstanceConfig implements Parcelable {\ncreatedPostAppLaunch = in.readByte() != 0x00;\nsslPinning = in.readByte() != 0x00;\nbackgroundSync = in.readByte() != 0x00;\n+ fcmSenderId = in.readString();\n}\n@SuppressWarnings(\"unused\")\n@@ -243,6 +249,10 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.backgroundSync = backgroundSync;\n}\n+ public String getFcmSenderId() {\n+ return fcmSenderId;\n+ }\n+\n@Override\npublic int describeContents() {\nreturn 0;\n@@ -263,6 +273,7 @@ public class CleverTapInstanceConfig implements Parcelable {\ndest.writeByte((byte) (sslPinning ? 0x01 : 0x00));\ndest.writeByte((byte) (createdPostAppLaunch ? 0x01 : 0x00));\ndest.writeByte((byte) (backgroundSync ? 0x01 : 0x00));\n+ dest.writeString(fcmSenderId);\n}\n@SuppressWarnings(\"unused\")\n@@ -294,6 +305,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nconfigJsonObject.put(\"createdPostAppLaunch\", isCreatedPostAppLaunch());\nconfigJsonObject.put(\"sslPinning\", isSslPinningEnabled());\nconfigJsonObject.put(\"backgroundSync\", isBackgroundSync());\n+ configJsonObject.put(\"fcmSenderId\", getFcmSenderId());\nreturn configJsonObject.toString();\n}catch (Throwable e){\nLogger.v(\"Unable to convert config to JSON : \",e.getCause());\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": "@@ -15,6 +15,7 @@ public class Constants {\nstatic final String LABEL_DISABLE_APP_LAUNCH = \"CLEVERTAP_DISABLE_APP_LAUNCHED\";\nstatic final String LABEL_SSL_PINNING = \"CLEVERTAP_SSL_PINNING\";\nstatic final String LABEL_BACKGROUND_SYNC = \"CLEVERTAP_BACKGROUND_SYNC\";\n+ static final String LABEL_FCM_SENDER_ID = \"FCM_SENDER_ID\";\nstatic final String CLEVERTAP_OPTOUT = \"ct_optout\";\nstatic final String CLEVERTAP_USE_GOOGLE_AD_ID = \"CLEVERTAP_USE_GOOGLE_AD_ID\";\nstatic final String CLEVERTAP_STORAGE_TAG = \"WizRocket\";\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": "@@ -299,6 +299,10 @@ class DeviceInfo {\nreturn ManifestInfo.getInstance(this.context).getGCMSenderId();\n}\n+ String getFCMSenderID(){\n+ return ManifestInfo.getInstance(this.context).getFCMSenderId();\n+ }\n+\nBoolean isWifiConnected() {\nBoolean ret = null;\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": "@@ -17,6 +17,7 @@ class ManifestInfo {\nprivate static String excludedActivities;\nprivate static boolean sslPinning;\nprivate static boolean backgroundSync;\n+ private static String fcmSenderId;\nprivate static String _getManifestStringValueForKey(Bundle manifest, String name) {\ntry {\n@@ -55,6 +56,10 @@ class ManifestInfo {\nexcludedActivities = _getManifestStringValueForKey(metaData,Constants.LABEL_INAPP_EXCLUDE);\nsslPinning = \"1\".equals(_getManifestStringValueForKey(metaData,Constants.LABEL_SSL_PINNING));\nbackgroundSync = \"1\".equals(_getManifestStringValueForKey(metaData,Constants.LABEL_BACKGROUND_SYNC));\n+ fcmSenderId = _getManifestStringValueForKey(metaData, Constants.LABEL_FCM_SENDER_ID);\n+ if (fcmSenderId != null) {\n+ fcmSenderId = fcmSenderId.replace(\"id:\", \"\");\n+ }\n}\nsynchronized static ManifestInfo getInstance(Context context){\n@@ -100,6 +105,10 @@ class ManifestInfo {\nreturn backgroundSync;\n}\n+ String getFCMSenderId() {\n+ return fcmSenderId;\n+ }\n+\nstatic void changeCredentials(String id, String token, String region){\naccountId = id;\naccountToken = token;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Added ability to request FCM tokens with specific Sender ID |
116,623 | 04.04.2019 16:14:36 | -19,080 | f1774947010f167bc70025e00c03aab405afac60 | Updating version to 3.4.3 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -29,7 +29,7 @@ ext {\nsiteUrl = 'https://github.com/CleverTap/clevertap-android-sdk'\ngitUrl = 'https://github.com/CleverTap/clevertap-android-sdk.git'\n- libraryVersion = '3.4.2'\n+ libraryVersion = '3.4.3'\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.4.2.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.4.3.0\"'\n}\nrelease {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.4.2.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.4.3.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=\"30402\"\n- android:versionName=\"3.4.2\">\n+ android:versionCode=\"30403\"\n+ android:versionName=\"3.4.3\">\n<application>\n<receiver\nandroid:name=\"com.clevertap.android.sdk.InstallReferrerBroadcastReceiver\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Updating version to 3.4.3 |
116,623 | 04.04.2019 17:38:09 | -19,080 | 41f6c858eba37e5e25bd8e46e2bdbcc1147b1c6e | Refactoring senderID variable | [
{
"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": "@@ -786,12 +786,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* request token from FCM\n*/\n- private String FCMGetFreshToken(final String senderId) {\n+ private String FCMGetFreshToken(final String senderID) {\nString token = null;\ntry {\n- if(senderId != null){\n- getConfigLogger().verbose(getAccountId(), \"FcmManager: Requesting a FCM token with Sender Id - \"+senderId);\n- token = FirebaseInstanceId.getInstance().getToken(senderId, FirebaseMessaging.INSTANCE_ID_SCOPE);\n+ if(senderID != null){\n+ getConfigLogger().verbose(getAccountId(), \"FcmManager: Requesting a FCM token with Sender Id - \"+senderID);\n+ token = FirebaseInstanceId.getInstance().getToken(senderID, FirebaseMessaging.INSTANCE_ID_SCOPE);\n}else {\ngetConfigLogger().verbose(getAccountId(), \"FcmManager: Requesting a FCM token\");\ntoken = FirebaseInstanceId.getInstance().getToken();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Refactoring senderID variable |
116,623 | 04.04.2019 17:53:21 | -19,080 | 0f7b9dc23052fefb180f83ea6a013de46c23e36d | Preparing for release v3.4.3 | [
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n+### Version 3.4.3 (April 4, 2019)\n+* Adds support for specifying custom FCM Sender ID to request token\n+\n### Version 3.4.2 (February 6, 2019)\n* Improved callback support for App Inbox\n* Fixed Carousel dots rendering issue\n"
},
{
"change_type": "MODIFY",
"old_path": "EXAMPLES.md",
"new_path": "EXAMPLES.md",
"diff": "@@ -269,6 +269,13 @@ CleverTap handles closing the notification with Action buttons. You will have to\n</service>\n```\n+Starting with v3.4.3, the CleverTap SDK supports specifying a custom FCM Sender ID. The SDK will now request for a token with the specified FCM Sender ID if it is present in the `AndroidManifest.xml`. If the FCM Sender ID is not present in the `AndroidManifest.xml` file, then the SDK will request for the token in the default manner which uses the app's `google-services.json` file. To use a custom FCM Sender ID, add the following field in your app's `AndroidManifest.xml`\n+```xml\n+ <meta-data\n+ android:name=\"FCM_SENDER_ID\"\n+ android:value=\"id:1234567890\"/>\n+```\n+\n#### Push Amplification\nStarting with v3.4.0, the SDK supports Push Amplification. Push Amplification is a capability that allows you to reach users on devices which suppress notifications via GCM/FCM. To allow your app to use CleverTap's Push Amplification via background ping service, add the following fields in your app's `AndroidManifest.xml`\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.4.2'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.4.3'\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.4.2', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.4.3', 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.4.2'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.4.3'\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@@ -59,8 +59,8 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n}\ndependencies {\n- classpath 'com.android.tools.build:gradle:3.3.0'\n- classpath 'com.google.gms:google-services:4.0.0'\n+ classpath 'com.android.tools.build:gradle:3.3.2'\n+ classpath 'com.google.gms:google-services:4.2.0'\n// NOTE: Do not place your application dependencies here; they belong\n// in the individual module build.gradle files\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk-3.4.2.aar",
"new_path": "clevertap-android-sdk-3.4.2.aar",
"diff": "Binary files a/clevertap-android-sdk-3.4.2.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "clevertap-android-sdk-3.4.3.aar",
"new_path": "clevertap-android-sdk-3.4.3.aar",
"diff": "Binary files /dev/null and b/clevertap-android-sdk-3.4.3.aar differ\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Preparing for release v3.4.3 |
116,623 | 04.04.2019 18:00:11 | -19,080 | be134c06a4f07494c398335ad9ff4976633743e1 | Updating Android Starter project to v3.4.3 | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/build.gradle",
"new_path": "AndroidStarter/app/build.gradle",
"diff": "@@ -29,7 +29,7 @@ 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.4.2', ext: 'aar') //CleverTap Android SDK, make sure the AAR file is in the libs folder\n+ implementation (name: 'clevertap-android-sdk-3.4.3', ext: 'aar') //CleverTap Android SDK, make sure the AAR file is in the libs folder\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.4.2.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.4.2.aar",
"diff": "Binary files a/AndroidStarter/app/libs/clevertap-android-sdk-3.4.2.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.4.3.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.4.3.aar",
"diff": "Binary files /dev/null and b/AndroidStarter/app/libs/clevertap-android-sdk-3.4.3.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/build.gradle",
"new_path": "AndroidStarter/build.gradle",
"diff": "@@ -5,13 +5,9 @@ buildscript {\nrepositories {\ngoogle()\njcenter()\n- maven {\n- url \"http://storage.googleapis.com/r8-releases/raw\" // ADD THIS TO FIX ISSUE #15\n- }\n}\ndependencies {\n- classpath 'com.android.tools:r8:1.3.52' // ADD THIS TO FIX ISSUE #15\n- classpath 'com.android.tools.build:gradle:3.3.0'\n+ classpath 'com.android.tools.build:gradle:3.3.2'\nclasspath 'com.google.gms:google-services:4.0.0'//Needed for FCM\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Updating Android Starter project to v3.4.3 |
116,623 | 06.05.2019 00:05:20 | -19,080 | 3f66990d0573f7908e3e18518b65884406a089ba | Adding CTID validation in onUserLogin | [
{
"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": "@@ -511,10 +511,12 @@ class CTInAppNotification implements Parcelable {\nprivate void removeImageOrGif(){\nfor(CTInAppNotificationMedia inAppMedia : this.mediaList){\nif(inAppMedia.getMediaUrl() != null){\n- if(inAppMedia.getContentType().equals(\"image/gif\")){\n+ if(!inAppMedia.getContentType().equals(\"image/gif\")){\nImageCache.removeBitmap(inAppMedia.getCacheKey());\n+ Logger.v(\"Deleted image - \"+inAppMedia.getCacheKey());\n}else{\nGifCache.removeByteArray(inAppMedia.getCacheKey());\n+ Logger.v(\"Deleted GIF - \"+inAppMedia.getCacheKey());\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -497,20 +497,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nsdkVersion = BuildConfig.SDK_VERSION_STRING;\nif(ManifestInfo.getInstance(context).useCustomId()){\n- if(cleverTapID == null){\n- Logger.i(\"CleverTap SDK has been directed to use custom CleverTap ID but custom ID passed is NULL. Please provide a valid custom ID.\");\n- return null;\n- }\n- if(cleverTapID.isEmpty()){\n- Logger.i(\"CleverTap SDK has been directed to use custom CleverTap ID but custom ID passed is empty. Please provide a valid custom ID.\");\n- return null;\n- }\n- if(cleverTapID.length() > 64){\n- Logger.i(\"Custom ID passed is greater than 64 characters. Please provide a valid custom ID. Cannot create CleverTap Instance.\");\n- return null;\n- }\n- if(!cleverTapID.matches(\"[a-zA-Z0-9]*\")){\n- Logger.i(\"Custom ID cannot contain special characters. Please provide a valid custom ID. Cannot create CleverTap Instance.\");\n+ if(!validateCTID(cleverTapID)){\nreturn null;\n}\n}\n@@ -601,6 +588,26 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n+ private static boolean validateCTID(String cleverTapID){\n+ if(cleverTapID == null){\n+ Logger.i(\"CleverTap SDK has been directed to use custom CleverTap ID but custom ID passed is NULL. Please provide a valid custom ID.\");\n+ return false;\n+ }\n+ if(cleverTapID.isEmpty()){\n+ Logger.i(\"CleverTap SDK has been directed to use custom CleverTap ID but custom ID passed is empty. Please provide a valid custom ID.\");\n+ return false;\n+ }\n+ if(cleverTapID.length() > 64){\n+ Logger.i(\"Custom ID passed is greater than 64 characters. Please provide a valid custom ID. Cannot create CleverTap Instance.\");\n+ return false;\n+ }\n+ if(!cleverTapID.matches(\"[a-zA-Z0-9]*\")){\n+ Logger.i(\"Custom ID cannot contain special characters. Please provide a valid custom ID. Cannot create CleverTap Instance.\");\n+ return false;\n+ }\n+ return true;\n+ }\n+\n//Lifecycle\nprivate void activityPaused() {\nsetAppForeground(false);\n@@ -4778,6 +4785,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\npublic void onUserLogin(final Map<String, Object> profile, final String cleverTapID) {\nif (profile == null) return;\n+ if(ManifestInfo.getInstance(context).useCustomId()){\n+ if(!validateCTID(cleverTapID)){\n+ return;\n+ }\n+ }\n+\ntry {\nfinal String currentGUID = getCleverTapID();\nif (currentGUID == null) return;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Adding CTID validation in onUserLogin |
116,623 | 06.05.2019 20:23:55 | -19,080 | 745bc9500534740993e5890697c6574a819f42ac | Slight UI changes as per design | [
{
"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": "@@ -85,10 +85,10 @@ class DeviceInfo {\nreturn;\n}\n+ if(cleverTapID!=null) {\ngetConfigLogger().info(config.getAccountId(), \"Updating CleverTapID to given custom ID : \" + cleverTapID);\n- forceUpdateDeviceId(cleverTapID);\n-\n- if(ManifestInfo.getInstance(context).useGoogleAdId()) {\n+ forceUpdateDeviceId(Constants.CUSTOM_CLEVERTAP_ID_PREFIX+cleverTapID);\n+ } else if(ManifestInfo.getInstance(context).useGoogleAdId()) {\nRunnable deviceIDRunnable = new Runnable() {\n@Override\npublic void run() {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-land/inapp_cover.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inapp_cover.xml",
"diff": "android:layout_marginTop=\"15dp\"\nandroid:layout_alignParentBottom=\"true\"\nandroid:layout_centerHorizontal=\"true\"\n- android:layout_marginBottom=\"54dp\"\n+ android:layout_marginBottom=\"48dp\"\n>\n<Button\nandroid:layout_width=\"264dp\"\nandroid:layout_height=\"42dp\"\nandroid:textSize=\"20sp\"\n- android:layout_marginLeft=\"10dp\"\n+ android:layout_marginLeft=\"24dp\"\nandroid:visibility=\"invisible\"\n- android:layout_marginStart=\"10dp\" />\n+ android:layout_marginStart=\"24dp\" />\n</LinearLayout>\n</RelativeLayout>\n<com.clevertap.android.sdk.CloseImageView\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_height=\"wrap_content\"\nandroid:layout_alignParentBottom=\"true\"\nandroid:layout_centerHorizontal=\"true\"\n- android:layout_marginBottom=\"26dp\"\n+ android:layout_marginBottom=\"12dp\"\nandroid:layout_below=\"@+id/half_interstitial_message\"\nandroid:gravity=\"bottom\"\nandroid:orientation=\"horizontal\"\nandroid:layout_width=\"224dp\"\nandroid:layout_height=\"40dp\"\nandroid:textSize=\"16sp\"\n- android:layout_marginLeft=\"5dp\"\n+ android:layout_marginLeft=\"10dp\"\nandroid:visibility=\"invisible\"\n- android:layout_marginStart=\"5dp\" />\n+ android:layout_marginStart=\"10dp\" />\n</LinearLayout>\n</RelativeLayout>\n<com.clevertap.android.sdk.CloseImageView\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": "android:textStyle=\"bold\"\nandroid:textColor=\"@android:color/black\"\nandroid:textSize=\"22sp\"\n+ android:layout_marginTop=\"12dp\"\nandroid:maxLines=\"1\" />\n<ImageView\nandroid:layout_width=\"240dp\"\nandroid:layout_height=\"134dp\"\nandroid:layout_centerHorizontal=\"true\"\n- android:layout_marginTop=\"4dp\"\n+ android:layout_marginTop=\"12dp\"\nandroid:scaleType=\"centerCrop\"\nandroid:layout_below=\"@+id/interstitial_title\"\nandroid:visibility=\"invisible\"/>\nandroid:layout_width=\"240dp\"\nandroid:layout_height=\"134dp\"\nandroid:layout_centerHorizontal=\"true\"\n- android:layout_marginTop=\"4dp\"\n+ android:layout_marginTop=\"12dp\"\nandroid:scaleType=\"centerCrop\"\nandroid:layout_below=\"@+id/interstitial_title\"\nandroid:visibility=\"gone\"/>\n<FrameLayout\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\n+ android:layout_marginTop=\"12dp\"\nandroid:visibility=\"gone\"\nandroid:id=\"@+id/video_frame\"\nandroid:layout_below=\"@id/interstitial_title\"\nandroid:layout_width=\"440dp\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_centerHorizontal=\"true\"\n- android:layout_marginTop=\"4dp\"\n+ android:layout_marginTop=\"12dp\"\nandroid:layout_below=\"@+id/backgroundImage\"\nandroid:gravity=\"center\"\nandroid:textSize=\"18sp\"\nandroid:layout_alignParentBottom=\"true\"\nandroid:layout_centerHorizontal=\"true\"\nandroid:orientation=\"horizontal\"\n- android:gravity=\"center\"\n+ android:gravity=\"bottom\"\n+ android:layout_marginBottom=\"8dp\"\nandroid:visibility=\"visible\">\n<Button\nandroid:layout_width=\"208dp\"\nandroid:layout_height=\"42dp\"\nandroid:textSize=\"16sp\"\n- android:visibility=\"gone\" />\n+ android:visibility=\"visible\" />\n<Button\nandroid:id=\"@+id/interstitial_button2\"\nandroid:layout_width=\"208dp\"\nandroid:layout_height=\"42dp\"\nandroid:textSize=\"16sp\"\n- android:layout_marginLeft=\"5dp\"\n- android:visibility=\"gone\"\n- android:layout_marginStart=\"5dp\" />\n+ android:layout_marginLeft=\"10dp\"\n+ android:visibility=\"visible\"\n+ android:layout_marginStart=\"10dp\" />\n</LinearLayout>\n</RelativeLayout>\n<com.clevertap.android.sdk.CloseImageView\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-sw600dp-land/inapp_cover.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-sw600dp-land/inapp_cover.xml",
"diff": "android:orientation=\"horizontal\"\nandroid:visibility=\"visible\"\nandroid:layout_below=\"@+id/cover_message\"\n- android:layout_marginTop=\"15dp\"\nandroid:layout_alignParentBottom=\"true\"\nandroid:layout_centerHorizontal=\"true\"\n- android:layout_marginBottom=\"54dp\"\n+ android:layout_marginBottom=\"48dp\"\n>\n<Button\nandroid:layout_width=\"264dp\"\nandroid:layout_height=\"42dp\"\nandroid:textSize=\"20sp\"\n- android:layout_marginLeft=\"10dp\"\n+ android:layout_marginLeft=\"30dp\"\nandroid:visibility=\"invisible\"\n- android:layout_marginStart=\"10dp\" />\n+ android:layout_marginStart=\"30dp\" />\n</LinearLayout>\n</RelativeLayout>\n<com.clevertap.android.sdk.CloseImageView\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Slight UI changes as per design |
116,623 | 15.05.2019 01:57:26 | -19,080 | 205513e5c04f1af884aaa2ac7425c412f3b6f9f9 | Fixed Video rendering in landscape inbox | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"diff": "@@ -229,7 +229,11 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.mediaLayout.setVisibility(View.VISIBLE);\nif(!content.getPosterUrl().isEmpty()) {\nthis.squareImage.setVisibility(View.VISIBLE);\n+ if(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE){\n+ this.squareImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ }else {\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n+ }\nGlide.with(this.squareImage.getContext())\n.load(content.getPosterUrl())\n.apply(new RequestOptions()\n@@ -239,7 +243,11 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}else{\nthis.mediaLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\n+ if(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE){\n+ this.squareImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ }else {\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n+ }\nthis.squareImage.setBackgroundColor(getImageBackgroundColor());\nint drawableId = Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL);\nif(drawableId != -1) {\n@@ -271,8 +279,10 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nint width;\nint height;\nif(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE) {\n- height = this.mediaLayout.getMeasuredHeight();\n- width = this.mediaLayout.getMeasuredWidth();\n+// height = this.mediaLayout.getMeasuredHeight();\n+// width = this.mediaLayout.getMeasuredWidth();\n+ height = resources.getDisplayMetrics().heightPixels/2;;\n+ width = resources.getDisplayMetrics().widthPixels/2;\n}else {\nwidth = resources.getDisplayMetrics().widthPixels;\nheight = inboxMessage.getOrientation().equalsIgnoreCase(\"l\") ? Math.round(width * 0.5625f) : width;\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": "@@ -171,13 +171,9 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nint height;\nif(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE) {\nif(message.getOrientation().equalsIgnoreCase(\"l\")){\n- //width = resources.getDisplayMetrics().widthPixels/2;\n- //height = Math.round(width * 0.5625f);\nwidth = this.mediaLayout.getMeasuredWidth();\nheight = Math.round(width * 0.5625f);\n}else{\n- //height = frameLayout.getLayoutParams().height;\n- //width = height;\nheight = this.mediaLayout.getMeasuredHeight();\nwidth = height;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"diff": "@@ -229,7 +229,11 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nif(!content.getPosterUrl().isEmpty()) {\nthis.mediaLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\n+ if(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE){\n+ this.squareImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ }else {\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n+ }\nGlide.with(this.squareImage.getContext())\n.load(content.getPosterUrl())\n.apply(new RequestOptions()\n@@ -239,7 +243,11 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}else{\nthis.mediaLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\n+ if(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE){\n+ this.squareImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ }else {\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n+ }\nint drawableId = Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL);\nif(drawableId != -1) {\nGlide.with(this.squareImage.getContext())\n@@ -269,8 +277,8 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nint width ;\nint height;\nif(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE) {\n- height = this.mediaLayout.getMeasuredHeight();\n- width = this.mediaLayout.getMeasuredWidth();\n+ height = resources.getDisplayMetrics().heightPixels/2;\n+ width = resources.getDisplayMetrics().widthPixels/2;\n}else {\nwidth = resources.getDisplayMetrics().widthPixels;\nheight = inboxMessage.getOrientation().equalsIgnoreCase(\"l\") ? Math.round(width * 0.5625f) : width;\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": "@@ -39,6 +39,8 @@ import android.support.annotation.RequiresApi;\nimport android.support.v4.app.NotificationCompat;\n+import com.bumptech.glide.request.BaseRequestOptions;\n+import com.bumptech.glide.request.RequestOptions;\nimport com.clevertap.android.sdk.exceptions.CleverTapMetaDataNotFoundException;\nimport com.clevertap.android.sdk.exceptions.CleverTapPermissionsNotSatisfied;\nimport com.google.android.gms.gcm.GoogleCloudMessaging;\n@@ -169,6 +171,19 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nhaveVideoPlayerSupport = checkForExoPlayer();\n}\n+ static boolean platformSupportsGlide = false;\n+ static {\n+ try {\n+ RequestOptions requestOptions = new RequestOptions();\n+\n+ // noinspection ConstantConditions\n+ platformSupportsGlide = requestOptions instanceof BaseRequestOptions;\n+ } catch (Throwable t){\n+ // no-op\n+ platformSupportsGlide = false;\n+ }\n+ }\n+\nprivate DBAdapter dbAdapter;\nprivate Context context;\nprivate LocalDataStore localDataStore;\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": "package com.clevertap.android.sdk;\nimport android.content.Context;\n+import android.content.res.Configuration;\nimport android.graphics.Color;\nimport android.graphics.Rect;\nimport android.graphics.drawable.Drawable;\n@@ -77,7 +78,11 @@ public class MediaPlayerRecyclerView extends RecyclerView {\nappContext = context.getApplicationContext();\nvideoSurfaceView = new PlayerView(appContext);\nvideoSurfaceView.setBackgroundColor(Color.TRANSPARENT);\n+ if(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE) {\n+ videoSurfaceView.setResizeMode(AspectRatioFrameLayout.RESIZE_MODE_FILL);\n+ }else{\nvideoSurfaceView.setResizeMode(AspectRatioFrameLayout.RESIZE_MODE_FIT);\n+ }\nvideoSurfaceView.setUseArtwork(true);\nDrawable artwork = context.getResources().getDrawable(R.drawable.ct_audio);\nvideoSurfaceView.setDefaultArtwork(Utils.drawableToBitmap(artwork));\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": "android:layout_width=\"208dp\"\nandroid:layout_height=\"42dp\"\nandroid:textSize=\"16sp\"\n- android:visibility=\"visible\" />\n+ android:visibility=\"gone\" />\n<Button\nandroid:id=\"@+id/interstitial_button2\"\nandroid:layout_height=\"42dp\"\nandroid:textSize=\"16sp\"\nandroid:layout_marginLeft=\"10dp\"\n- android:visibility=\"visible\"\n+ android:visibility=\"gone\"\nandroid:layout_marginStart=\"10dp\" />\n</LinearLayout>\n</RelativeLayout>\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_icon_message_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_icon_message_layout.xml",
"diff": "android:layout_height=\"match_parent\"\nandroid:src=\"@drawable/ct_video_1\"\nandroid:layout_centerInParent=\"true\"\n- android:scaleType=\"centerCrop\"\n- android:visibility=\"visible\" />\n+ android:scaleType=\"fitCenter\"\n+ android:visibility=\"gone\" />\n<com.clevertap.android.sdk.HorizontalSquareImageView\nandroid:id=\"@+id/square_media_image\"\n<FrameLayout\nandroid:id=\"@+id/icon_message_frame_layout\"\n- android:layout_width=\"match_parent\"\n+ android:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_centerInParent=\"true\"\nandroid:visibility=\"gone\"/>\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fixed Video rendering in landscape inbox |
116,623 | 16.05.2019 13:50:51 | -19,080 | 5fbda71d40387e2adb6a3fa8da45693908c5ac7a | Handling Glide dependency issue and making Alert template rotate | [
{
"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.4.4'\n+ libraryVersion = '3.5.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.4.4.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.5.0.0\"'\n}\nrelease {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.4.4.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.5.0.0\"'\nminifyEnabled false\nproguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTCarouselViewPagerAdapter.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTCarouselViewPagerAdapter.java",
"diff": "@@ -63,12 +63,20 @@ public class CTCarouselViewPagerAdapter extends PagerAdapter {\nif (inboxMessage.getOrientation().equalsIgnoreCase(\"l\")) {\nImageView imageView = view.findViewById(R.id.imageView);\nimageView.setVisibility(View.VISIBLE);\n+ try{\nGlide.with(imageView.getContext())\n.load(carouselImages.get(position))\n.apply(new RequestOptions()\n.placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n.error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(imageView);\n+ }catch (NoSuchMethodError error){\n+ Logger.d(\"CleverTap SDK requires Glide v4.9.0 or above. Please refer CleverTap Documentation for more info\");\n+ Glide.with(imageView.getContext())\n+ .load(carouselImages.get(position))\n+ .into(imageView);\n+ }\n+\ncontainer.addView(view, layoutParams);\nview.setOnClickListener(new View.OnClickListener() {\n@Override\n@@ -82,12 +90,20 @@ public class CTCarouselViewPagerAdapter extends PagerAdapter {\n} else if (inboxMessage.getOrientation().equalsIgnoreCase(\"p\")) {\nImageView imageView = view.findViewById(R.id.squareImageView);\nimageView.setVisibility(View.VISIBLE);\n+ try {\nGlide.with(imageView.getContext())\n.load(carouselImages.get(position))\n.apply(new RequestOptions()\n.placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n.error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(imageView);\n+ }catch (NoSuchMethodError error){\n+ Logger.d(\"CleverTap SDK requires Glide v4.9.0 or above. Please refer CleverTap Documentation for more info\");\n+ Glide.with(imageView.getContext())\n+ .load(carouselImages.get(position))\n+ .into(imageView);\n+ }\n+\ncontainer.addView(view, layoutParams);\nview.setOnClickListener(new View.OnClickListener() {\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"diff": "@@ -151,16 +151,25 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.mediaLayout.setVisibility(View.VISIBLE);\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ try{\nGlide.with(this.mediaImage.getContext())\n.load(content.getMedia())\n.apply(new RequestOptions()\n.placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n.error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(this.mediaImage);\n+ }catch (NoSuchMethodError error){\n+ Logger.d(\"CleverTap SDK requires Glide v4.9.0 or above. Please refer CleverTap Documentation for more info\");\n+ Glide.with(this.mediaImage.getContext())\n+ .load(content.getMedia())\n+ .into(this.mediaImage);\n+ }\n+\n} else if (content.mediaIsGIF()) {\nthis.mediaLayout.setVisibility(View.VISIBLE);\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n+ try{\nGlide.with(this.mediaImage.getContext())\n.asGif()\n.load(content.getMedia())\n@@ -168,17 +177,33 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n.error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(this.mediaImage);\n+ }catch (NoSuchMethodError error){\n+ Logger.d(\"CleverTap SDK requires Glide v4.9.0 or above. Please refer CleverTap Documentation for more info\");\n+ Glide.with(this.mediaImage.getContext())\n+ .asGif()\n+ .load(content.getMedia())\n+ .into(this.mediaImage);\n+ }\n+\n} else if (content.mediaIsVideo()) {\nthis.mediaLayout.setVisibility(View.VISIBLE);\nif(!content.getPosterUrl().isEmpty()) {\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ try {\nGlide.with(this.mediaImage.getContext())\n.load(content.getPosterUrl())\n.apply(new RequestOptions()\n.placeholder(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL))\n.error(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL)))\n.into(this.mediaImage);\n+ }catch (NoSuchMethodError error){\n+ Logger.d(\"CleverTap SDK requires Glide v4.9.0 or above. Please refer CleverTap Documentation for more info\");\n+ Glide.with(this.mediaImage.getContext())\n+ .load(content.getPosterUrl())\n+ .into(this.mediaImage);\n+ }\n+\n}else{\nthis.mediaLayout.setVisibility(View.VISIBLE);\nthis.mediaImage.setVisibility(View.VISIBLE);\n@@ -208,16 +233,25 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.mediaLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ try {\nGlide.with(this.squareImage.getContext())\n.load(content.getMedia())\n.apply(new RequestOptions()\n.placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n.error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(this.squareImage);\n+ }catch (NoSuchMethodError error){\n+ Logger.d(\"CleverTap SDK requires Glide v4.9.0 or above. Please refer CleverTap Documentation for more info\");\n+ Glide.with(this.squareImage.getContext())\n+ .load(content.getMedia())\n+ .into(this.squareImage);\n+ }\n+\n} else if (content.mediaIsGIF()) {\nthis.mediaLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n+ try {\nGlide.with(this.squareImage.getContext())\n.asGif()\n.load(content.getMedia())\n@@ -225,6 +259,14 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n.error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(this.squareImage);\n+ }catch (NoSuchMethodError error){\n+ Logger.d(\"CleverTap SDK requires Glide v4.9.0 or above. Please refer CleverTap Documentation for more info\");\n+ Glide.with(this.squareImage.getContext())\n+ .asGif()\n+ .load(content.getMedia())\n+ .into(this.squareImage);\n+ }\n+\n} else if (content.mediaIsVideo()) {\nthis.mediaLayout.setVisibility(View.VISIBLE);\nif(!content.getPosterUrl().isEmpty()) {\n@@ -234,12 +276,20 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}else {\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n}\n+ try {\n+ Logger.d(\"CleverTap SDK requires Glide v4.9.0 or above. Please refer CleverTap Documentation for more info\");\nGlide.with(this.squareImage.getContext())\n.load(content.getPosterUrl())\n.apply(new RequestOptions()\n.placeholder(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL))\n.error(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL)))\n.into(this.squareImage);\n+ }catch (NoSuchMethodError error){\n+ Glide.with(this.squareImage.getContext())\n+ .load(content.getPosterUrl())\n+ .into(this.squareImage);\n+ }\n+\n}else{\nthis.mediaLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\n@@ -314,12 +364,20 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\ntry {\nif (!content.getIcon().isEmpty()) {\niconImage.setVisibility(View.VISIBLE);\n+ try {\nGlide.with(iconImage.getContext())\n.load(content.getIcon())\n.apply(new RequestOptions()\n.placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n.error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(iconImage);\n+ }catch (NoSuchMethodError error){\n+ Logger.d(\"CleverTap SDK requires Glide v4.9.0 or above. Please refer CleverTap Documentation for more info\");\n+ Glide.with(iconImage.getContext())\n+ .load(content.getIcon())\n+ .into(iconImage);\n+ }\n+\n} else {\niconImage.setVisibility(View.GONE);\n}\n"
},
{
"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": "@@ -79,10 +79,6 @@ public class CTInAppNativeHalfInterstitialFragment extends CTInAppBaseFullNative\n}\n}\n});\n-// if (inAppNotification.getImage() != null) {\n-// ImageView imageView = relativeLayout.findViewById(R.id.backgroundImage);\n-// imageView.setImageBitmap(inAppNotification.getImage());\n-// }\nbreak;\ncase Configuration.ORIENTATION_LANDSCAPE:\nrelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n"
},
{
"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": "@@ -71,11 +71,6 @@ public class CTInAppNativeHalfInterstitialImageFragment extends CTInAppBaseFullF\n}\n}\n});\n-// if(inAppNotification.getImage()!=null) {\n-// imageView.setImageBitmap(inAppNotification.getImage());\n-// imageView.setTag(0);\n-// imageView.setOnClickListener(new CTInAppNativeButtonClickListener());\n-// }\nbreak;\ncase Configuration.ORIENTATION_LANDSCAPE:\nrelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTSimpleMessageViewHolder.java",
"diff": "@@ -151,16 +151,24 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.mediaLayout.setVisibility(View.VISIBLE);\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ try {\nGlide.with(this.mediaImage.getContext())\n.load(content.getMedia())\n.apply(new RequestOptions()\n.placeholder(Utils.getThumbnailImage(context, Constants.IMAGE_PLACEHOLDER))\n.error(Utils.getThumbnailImage(context, Constants.IMAGE_PLACEHOLDER)))\n.into(this.mediaImage);\n+ }catch (NoSuchMethodError error){\n+ Logger.d(\"CleverTap SDK requires Glide v4.9.0 or above. Please refer CleverTap Documentation for more info\");\n+ Glide.with(this.mediaImage.getContext())\n+ .load(content.getMedia())\n+ .into(this.mediaImage);\n+ }\n} else if (content.mediaIsGIF()) {\nthis.mediaLayout.setVisibility(View.VISIBLE);\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n+ try {\nGlide.with(this.mediaImage.getContext())\n.asGif()\n.load(content.getMedia())\n@@ -168,17 +176,33 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n.error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(this.mediaImage);\n+ }catch (NoSuchMethodError error){\n+ Logger.d(\"CleverTap SDK requires Glide v4.9.0 or above. Please refer CleverTap Documentation for more info\");\n+ Glide.with(this.mediaImage.getContext())\n+ .asGif()\n+ .load(content.getMedia())\n+ .into(this.mediaImage);\n+ }\n+\n} else if (content.mediaIsVideo()) {\nif(!content.getPosterUrl().isEmpty()) {\nthis.mediaLayout.setVisibility(View.VISIBLE);\nthis.mediaImage.setVisibility(View.VISIBLE);\nthis.mediaImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ try {\nGlide.with(this.mediaImage.getContext())\n.load(content.getPosterUrl())\n.apply(new RequestOptions()\n.placeholder(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL))\n.error(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL)))\n.into(this.mediaImage);\n+ }catch (NoSuchMethodError error){\n+ Logger.d(\"CleverTap SDK requires Glide v4.9.0 or above. Please refer CleverTap Documentation for more info\");\n+ Glide.with(this.mediaImage.getContext())\n+ .load(content.getPosterUrl())\n+ .into(this.mediaImage);\n+ }\n+\n} else {\nthis.mediaLayout.setVisibility(View.VISIBLE);\nthis.mediaImage.setVisibility(View.VISIBLE);\n@@ -208,16 +232,24 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.mediaLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.CENTER_CROP);\n+ try{\nGlide.with(this.squareImage.getContext())\n.load(content.getMedia())\n.apply(new RequestOptions()\n.placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n.error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(this.squareImage);\n+ }catch (NoSuchMethodError error){\n+ Logger.d(\"CleverTap SDK requires Glide v4.9.0 or above. Please refer CleverTap Documentation for more info\");\n+ Glide.with(this.squareImage.getContext())\n+ .load(content.getMedia())\n+ .into(this.squareImage);\n+ }\n} else if (content.mediaIsGIF()) {\nthis.mediaLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n+ try {\nGlide.with(this.squareImage.getContext())\n.asGif()\n.load(content.getMedia())\n@@ -225,6 +257,13 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n.placeholder(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER))\n.error(Utils.getThumbnailImage(context,Constants.IMAGE_PLACEHOLDER)))\n.into(this.squareImage);\n+ }catch (NoSuchMethodError error){\n+ Logger.d(\"CleverTap SDK requires Glide v4.9.0 or above. Please refer CleverTap Documentation for more info\");\n+ Glide.with(this.squareImage.getContext())\n+ .asGif()\n+ .load(content.getMedia())\n+ .into(this.squareImage);\n+ }\n} else if (content.mediaIsVideo()) {\nif(!content.getPosterUrl().isEmpty()) {\nthis.mediaLayout.setVisibility(View.VISIBLE);\n@@ -234,12 +273,20 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\n}else {\nthis.squareImage.setScaleType(ImageView.ScaleType.FIT_CENTER);\n}\n+ try {\nGlide.with(this.squareImage.getContext())\n.load(content.getPosterUrl())\n.apply(new RequestOptions()\n.placeholder(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL))\n.error(Utils.getThumbnailImage(context,Constants.VIDEO_THUMBNAIL)))\n.into(this.squareImage);\n+ }catch (NoSuchMethodError error){\n+ Logger.d(\"CleverTap SDK requires Glide v4.9.0 or above. Please refer CleverTap Documentation for more info\");\n+ Glide.with(this.squareImage.getContext())\n+ .load(content.getPosterUrl())\n+ .into(this.squareImage);\n+ }\n+\n}else{\nthis.mediaLayout.setVisibility(View.VISIBLE);\nthis.squareImage.setVisibility(View.VISIBLE);\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": "@@ -39,8 +39,8 @@ import android.support.annotation.RequiresApi;\nimport android.support.v4.app.NotificationCompat;\n-import com.bumptech.glide.request.BaseRequestOptions;\n-import com.bumptech.glide.request.RequestOptions;\n+//import com.bumptech.glide.request.BaseRequestOptions;\n+//import com.bumptech.glide.request.RequestOptions;\nimport com.clevertap.android.sdk.exceptions.CleverTapMetaDataNotFoundException;\nimport com.clevertap.android.sdk.exceptions.CleverTapPermissionsNotSatisfied;\nimport com.google.android.gms.gcm.GoogleCloudMessaging;\n@@ -171,19 +171,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nhaveVideoPlayerSupport = checkForExoPlayer();\n}\n- static boolean platformSupportsGlide = false;\n- static {\n- try {\n- RequestOptions requestOptions = new RequestOptions();\n-\n- // noinspection ConstantConditions\n- platformSupportsGlide = requestOptions instanceof BaseRequestOptions;\n- } catch (Throwable t){\n- // no-op\n- platformSupportsGlide = false;\n- }\n- }\n-\nprivate DBAdapter dbAdapter;\nprivate Context context;\nprivate LocalDataStore localDataStore;\n@@ -1721,14 +1708,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate void addErrorToEvent(JSONObject event, String error){\nif(getCleverTapID().contains(Constants.ERROR_PROFILE_PREFIX)) {\n- try {\nValidationResult validationResult = new ValidationResult();\nvalidationResult.setErrorCode(514);\nvalidationResult.setErrorDesc(error);\n- event.put(Constants.ERROR_KEY, getErrorObject(validationResult));\n- } catch (JSONException e) {\n- e.printStackTrace();\n- }\n+ pushValidationResult(validationResult);\n}\n}\n@@ -3276,7 +3259,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//Profile\nprivate void pushBasicProfile(JSONObject baseProfile) {\ntry {\n- String guid = getCleverTapID();\n+ String guid = this.deviceInfo.getDeviceID();\nJSONObject profileEvent = new JSONObject();\n@@ -3327,6 +3310,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nJSONObject event = new JSONObject();\nevent.put(\"profile\", profileEvent);\n+ addErrorToEvent(event,\"Basic Profile push from erroneous profile - \" +getCleverTapID());\nqueueEvent(context, event, Constants.PROFILE_EVENT);\n} catch (JSONException e) {\ngetConfigLogger().verbose(getAccountId(), \"FATAL: Creating basic profile update event failed!\");\n@@ -3338,7 +3322,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate void cacheGUIDForIdentifier(String guid, String key, String identifier) {\nif (guid == null || key == null || identifier == null) {\n- //TODO log something\nreturn;\n}\n@@ -4364,6 +4347,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nevent.put(\"evtName\", Constants.NOTIFICATION_CLICKED_EVENT_NAME);\nevent.put(\"evtData\", notif);\n+ addErrorToEvent(event,\"Notification Clicked pushed from erroneous profile - \" +getCleverTapID());\nqueueEvent(context, event, Constants.RAISED_EVENT);\ntry {\n@@ -4656,6 +4640,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n} catch (Throwable ignored) {\n//no-op\n}\n+ addErrorToEvent(event,\"Notification Viewed pushed from erroneous profile - \" +getCleverTapID());\nqueueEvent(context, event, Constants.NV_EVENT);\n}\n@@ -5175,6 +5160,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ndata.put(\"type\", type.toString());\nevent.put(\"data\", data);\ngetConfigLogger().verbose(getAccountId(), \"DataHandler: pushing device token with action \" + action + \" and type \" + type.toString());\n+ addErrorToEvent(event,\"FCM Device Token pushed from erroneous profile - \" +getCleverTapID());\nqueueEvent(context, event, Constants.DATA_EVENT);\n} catch (JSONException e) {\n// we won't get here\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": "@@ -168,7 +168,6 @@ class DBAdapter {\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.PUSH_NOTIFICATIONS.getName());\ndb.execSQL(\"DROP TABLE IF EXISTS \" + Table.UNINSTALL_TS.getName());\ndb.execSQL(\"DROP TABLE IF EXISTS \" + Table.INBOX_MESSAGES.getName());\ndb.execSQL(\"DROP TABLE IF EXISTS \" + Table.PUSH_NOTIFICATION_VIEWED.getName());\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -23,6 +23,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nprivate CTInAppNotification inAppNotification;\nprivate CleverTapInstanceConfig config;\nprivate WeakReference<InAppActivityListener> listenerWeakReference;\n+ private static boolean isAlertVisible = false;\nvoid setListener(InAppActivityListener listener) {\nlistenerWeakReference = new WeakReference<>(listener);\n@@ -112,6 +113,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n.add(android.R.id.content, contentFragment, getFragmentTag())\n.commit();\n}\n+ }else if(isAlertVisible){\n+ createContentFragment();\n}\n}\n@@ -255,6 +258,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\n//noinspection ConstantConditions\nalertDialog.show();\n+ isAlertVisible = true;\ndidShow(null);\nbreak;\n}\n@@ -281,6 +285,9 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\nvoid didDismiss(Bundle data) {\n+ if(isAlertVisible){\n+ isAlertVisible = false;\n+ }\nfinish();\nInAppActivityListener listener = getListener();\nif (listener != null) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Handling Glide dependency issue and making Alert template rotate |
116,623 | 16.05.2019 20:38:44 | -19,080 | f453d26aa35455b102dc187e31a00b14a4479c3e | Fixed issue of no media on Intersitital content template | [
{
"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": "@@ -114,6 +114,7 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\n}\n}\n});\n+ if(!inAppNotification.getMediaList().isEmpty()) {\nif (inAppNotification.getMediaList().get(0).isImage()) {\nBitmap image = inAppNotification.getImage(inAppNotification.getMediaList().get(0));\nif (image != null) {\n@@ -121,25 +122,23 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nimageView.setVisibility(View.VISIBLE);\nimageView.setImageBitmap(inAppNotification.getImage(inAppNotification.getMediaList().get(0)));\n}\n- }\n- else if (inAppNotification.getMediaList().get(0).isGIF()) {\n+ } else if (inAppNotification.getMediaList().get(0).isGIF()) {\nif (inAppNotification.getGifByteArray(inAppNotification.getMediaList().get(0)) != null) {\ngifImageView = relativeLayout.findViewById(R.id.gifImage);\ngifImageView.setVisibility(View.VISIBLE);\ngifImageView.setBytes(inAppNotification.getGifByteArray(inAppNotification.getMediaList().get(0)));\ngifImageView.startAnimation();\n}\n- }\n- else if (inAppNotification.getMediaList().get(0).isVideo()) {\n+ } else if (inAppNotification.getMediaList().get(0).isVideo()) {\ninitFullScreenDialog();\nprepareMedia();\nplayMedia();\n- }\n- else if (inAppNotification.getMediaList().get(0).isAudio()) {\n+ } else if (inAppNotification.getMediaList().get(0).isAudio()) {\nprepareMedia();\nplayMedia();\ndisableFullScreenButton();\n}\n+ }\nbreak;\ncase Configuration.ORIENTATION_LANDSCAPE:\nrelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@@ -173,6 +172,7 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\n}\n}\n});\n+ if(!inAppNotification.getMediaList().isEmpty()) {\nif (inAppNotification.getMediaList().get(0).isImage()) {\nBitmap image = inAppNotification.getImage(inAppNotification.getMediaList().get(0));\nif (image != null) {\n@@ -180,25 +180,23 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nimageView.setVisibility(View.VISIBLE);\nimageView.setImageBitmap(inAppNotification.getImage(inAppNotification.getMediaList().get(0)));\n}\n- }\n- else if (inAppNotification.getMediaList().get(0).isGIF()) {\n+ } else if (inAppNotification.getMediaList().get(0).isGIF()) {\nif (inAppNotification.getGifByteArray(inAppNotification.getMediaList().get(0)) != null) {\ngifImageView = relativeLayout.findViewById(R.id.gifImage);\ngifImageView.setVisibility(View.VISIBLE);\ngifImageView.setBytes(inAppNotification.getGifByteArray(inAppNotification.getMediaList().get(0)));\ngifImageView.startAnimation();\n}\n- }\n- else if (inAppNotification.getMediaList().get(0).isVideo()) {\n+ } else if (inAppNotification.getMediaList().get(0).isVideo()) {\ninitFullScreenDialog();\nprepareMedia();\nplayMedia();\n- }\n- else if (inAppNotification.getMediaList().get(0).isAudio()) {\n+ } else if (inAppNotification.getMediaList().get(0).isAudio()) {\nprepareMedia();\nplayMedia();\ndisableFullScreenButton();\n}\n+ }\nbreak;\n}\n@@ -380,11 +378,13 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\n@Override\npublic void onResume() {\nsuper.onResume();\n+ if(!inAppNotification.getMediaList().isEmpty()) {\nif (player == null && (inAppNotification.getMediaList().get(0).isVideo() || inAppNotification.getMediaList().get(0).isAudio())) {\nprepareMedia();\nplayMedia();\n}\n}\n+ }\n@Override\npublic void onSaveInstanceState(Bundle outState) {\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": "@@ -711,7 +711,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ntry {\nevent.put(\"evtName\", Constants.APP_LAUNCHED_EVENT);\nevent.put(\"evtData\", getAppLaunchedFields());\n- addErrorToEvent(event,\"App Launched from erroneous profile - \" +getCleverTapID());\n+ addErrorToEvent(\"App Launched from erroneous profile - \" +getCleverTapID());\n} catch (Throwable t) {\n// We won't get here\n@@ -1706,7 +1706,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn error;\n}\n- private void addErrorToEvent(JSONObject event, String error){\n+ private void addErrorToEvent(String error){\nif(getCleverTapID().contains(Constants.ERROR_PROFILE_PREFIX)) {\nValidationResult validationResult = new ValidationResult();\nvalidationResult.setErrorCode(514);\n@@ -3310,7 +3310,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nJSONObject event = new JSONObject();\nevent.put(\"profile\", profileEvent);\n- addErrorToEvent(event,\"Basic Profile push from erroneous profile - \" +getCleverTapID());\n+ addErrorToEvent(\"Profile pushed from erroneous profile - \" +getCleverTapID());\nqueueEvent(context, event, Constants.PROFILE_EVENT);\n} catch (JSONException e) {\ngetConfigLogger().verbose(getAccountId(), \"FATAL: Creating basic profile update event failed!\");\n@@ -4347,7 +4347,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nevent.put(\"evtName\", Constants.NOTIFICATION_CLICKED_EVENT_NAME);\nevent.put(\"evtData\", notif);\n- addErrorToEvent(event,\"Notification Clicked pushed from erroneous profile - \" +getCleverTapID());\n+ addErrorToEvent(\"Notification Clicked pushed from erroneous profile - \" +getCleverTapID());\nqueueEvent(context, event, Constants.RAISED_EVENT);\ntry {\n@@ -4640,7 +4640,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n} catch (Throwable ignored) {\n//no-op\n}\n- addErrorToEvent(event,\"Notification Viewed pushed from erroneous profile - \" +getCleverTapID());\n+ addErrorToEvent(\"Notification Viewed pushed from erroneous profile - \" +getCleverTapID());\nqueueEvent(context, event, Constants.NV_EVENT);\n}\n@@ -5160,7 +5160,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ndata.put(\"type\", type.toString());\nevent.put(\"data\", data);\ngetConfigLogger().verbose(getAccountId(), \"DataHandler: pushing device token with action \" + action + \" and type \" + type.toString());\n- addErrorToEvent(event,\"FCM Device Token pushed from erroneous profile - \" +getCleverTapID());\n+ addErrorToEvent(\"FCM Device Token pushed from erroneous profile - \" +getCleverTapID());\nqueueEvent(context, event, Constants.DATA_EVENT);\n} catch (JSONException e) {\n// we won't get here\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fixed issue of no media on Intersitital content template |
116,623 | 17.05.2019 18:02:30 | -19,080 | 389003d14f16627adc622b226e9bf06ae2613999 | Updating SDK version to v3.5.0 | [
{
"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=\"30404\"\n- android:versionName=\"3.4.4\">\n+ android:versionCode=\"30500\"\n+ android:versionName=\"3.5.0\">\n<application>\n<receiver\nandroid:name=\"com.clevertap.android.sdk.InstallReferrerBroadcastReceiver\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTCarouselImageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTCarouselImageViewHolder.java",
"diff": "@@ -54,7 +54,6 @@ public class CTCarouselImageViewHolder extends CTInboxBaseMessageViewHolder {\nCTCarouselViewPagerAdapter carouselViewPagerAdapter = new CTCarouselViewPagerAdapter(appContext, parent, inboxMessage,layoutParams,position);\nthis.imageViewPager.setAdapter(carouselViewPagerAdapter);\n//Adds the dots for the carousel\n- //int dotsCount = carouselViewPagerAdapter.getCount();\nint dotsCount = inboxMessage.getInboxMessageContents().size();\nif(this.sliderDots.getChildCount()>0){\nthis.sliderDots.removeAllViews();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTCarouselMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTCarouselMessageViewHolder.java",
"diff": "@@ -65,7 +65,6 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\nCTCarouselViewPagerAdapter carouselViewPagerAdapter = new CTCarouselViewPagerAdapter(appContext, parent, inboxMessage,layoutParams,position);\nthis.imageViewPager.setAdapter(carouselViewPagerAdapter);\n//Adds the dots for the carousel\n- //int dotsCount = carouselViewPagerAdapter.getCount();\nint dotsCount = inboxMessage.getInboxMessageContents().size();\nif(this.sliderDots.getChildCount()>0){\nthis.sliderDots.removeAllViews();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTIconMessageViewHolder.java",
"diff": "@@ -329,8 +329,6 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nint width;\nint height;\nif(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE) {\n-// height = this.mediaLayout.getMeasuredHeight();\n-// width = this.mediaLayout.getMeasuredWidth();\nheight = resources.getDisplayMetrics().heightPixels/2;;\nwidth = resources.getDisplayMetrics().widthPixels/2;\n}else {\n"
},
{
"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": "@@ -87,8 +87,6 @@ public class CTInAppNativeInterstitialImageFragment extends CTInAppBaseFullFragm\nlayoutParams.setMargins(120, 40, 85, 0);\nlayoutParams.width = (relativeLayout1.getMeasuredWidth()) - 75;\nlayoutHeight = layoutParams.height = (int) (layoutParams.width * 0.5625f);\n- //layoutParams.height = relativeLayout1.getMeasuredHeight();\n- //layoutParams.width = (int) (layoutParams.height * 1.78f);\nrelativeLayout1.setLayoutParams(layoutParams);\nFrameLayout.LayoutParams closeLp = new FrameLayout.LayoutParams(closeImageView.getWidth(), closeImageView.getHeight());\ncloseLp.gravity = Gravity.TOP | Gravity.END;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNotificationMedia.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNotificationMedia.java",
"diff": "@@ -35,7 +35,7 @@ public class CTInAppNotificationMedia implements Parcelable {\n}\n}\n}catch (JSONException e){\n- //\n+ Logger.v(\"Error parsing Media JSONObject - \"+e.getLocalizedMessage());\n}\nif(contentType.isEmpty()){\nreturn null;\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": "@@ -171,10 +171,10 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nint height;\nif(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE) {\nif(message.getOrientation().equalsIgnoreCase(\"l\")){\n- width = this.mediaLayout.getMeasuredWidth();\n- height = Math.round(width * 0.5625f);\n+ width = Math.round(this.mediaImage.getMeasuredHeight() * 1.76f);\n+ height = this.mediaImage.getMeasuredHeight();\n}else{\n- height = this.mediaLayout.getMeasuredHeight();\n+ height = this.squareImage.getMeasuredHeight();\nwidth = height;\n}\n}else {\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": "@@ -122,13 +122,6 @@ public class CTInboxListViewFragment extends Fragment {\nfinal LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity());\nfinal CTInboxMessageAdapter inboxMessageAdapter = new CTInboxMessageAdapter(inboxMessages, this);\n-// if(CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE){\n-// int width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, Constants.LIST_VIEW_WIDTH, getResources().getDisplayMetrics());\n-// LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(width, ViewGroup.LayoutParams.MATCH_PARENT);\n-// layoutParams.gravity = Gravity.CENTER;\n-// linearLayout.setLayoutParams(layoutParams);\n-// }\n-\nif (haveVideoPlayerSupport) {\nmediaRecyclerView = new MediaPlayerRecyclerView(getActivity());\nsetMediaRecyclerView(mediaRecyclerView);\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": "@@ -39,8 +39,6 @@ import android.support.annotation.RequiresApi;\nimport android.support.v4.app.NotificationCompat;\n-//import com.bumptech.glide.request.BaseRequestOptions;\n-//import com.bumptech.glide.request.RequestOptions;\nimport com.clevertap.android.sdk.exceptions.CleverTapMetaDataNotFoundException;\nimport com.clevertap.android.sdk.exceptions.CleverTapPermissionsNotSatisfied;\nimport com.google.android.gms.gcm.GoogleCloudMessaging;\n@@ -577,33 +575,19 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (instance == null){\ninstance = new CleverTapAPI(context, config, cleverTapID);//Pass custom CTID to constructor\ninstances.put(config.getAccountId(), instance);\n+ if(instance.getCleverTapID() != null) {\ninstance.notifyUserProfileInitialized();\n+ instance.addErrorToEvent(\"Attempted to set invalid custom CleverTap ID - \"+cleverTapID+\" fallback to default error device ID : \" + instance.getFallbackDeviceID());\n}\n- else if(instance.getCleverTapID().contains(Constants.ERROR_PROFILE_PREFIX) && cleverTapID != null){ //If Instance is created with NULL guid, update with correct guid if provided again\n- final CleverTapAPI finalInstance = instance;\n- final Context queueContext = context;\n- final String updatedCTID = cleverTapID;\n+ }\n+ else if(instance.getCleverTapID() != null){\n+ if(instance.getCleverTapID().contains(Constants.ERROR_PROFILE_PREFIX) && cleverTapID != null) { //If Instance is created with NULL guid, update with correct guid if provided again\n//Check if given CTID is valid or not and Manifest allows us to use it\nif(ManifestInfo.getInstance(context).useCustomId()) {\n- if(Utils.validateCTID(updatedCTID)) {\n+ if(Utils.validateCTID(cleverTapID)) {\nLogger.i(\"Updating device ID after flushing events for the fallback device ID\");\n- instance.postAsyncSafely(\"flushingQueues\", new Runnable() {\n- @Override\n- public void run() {\n- finalInstance.flushQueueSync(queueContext, EventGroup.REGULAR);\n- finalInstance.flushQueueSync(queueContext, EventGroup.PUSH_NOTIFICATION_VIEWED);\n- finalInstance.clearQueues(queueContext);\n- finalInstance.setCurrentUserOptedOut(false);\n- finalInstance.getLocalDataStore().changeUser();\n- finalInstance.destroySession();\n- activityCount = 1;\n- finalInstance.deviceInfo.forceUpdateDeviceId(Constants.CUSTOM_CLEVERTAP_ID_PREFIX + updatedCTID);\n- finalInstance.resetInbox();\n- finalInstance.setCurrentUserOptOutStateFromStorage();\n- finalInstance.forcePushDeviceToken(true);\n- finalInstance.notifyUserProfileInitialized();\n+ instance.asyncProfileSwitchUser(null,instance.deviceInfo,null,cleverTapID);\n}\n- });\n}\n}\n}\n@@ -1707,6 +1691,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nprivate void addErrorToEvent(String error){\n+ if(getCleverTapID() != null) {\nif (getCleverTapID().contains(Constants.ERROR_PROFILE_PREFIX)) {\nValidationResult validationResult = new ValidationResult();\nvalidationResult.setErrorCode(514);\n@@ -1714,6 +1699,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\npushValidationResult(validationResult);\n}\n}\n+ }\n/**\n* Enables the Profile/Events Read and Synchronization API\n@@ -3259,7 +3245,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//Profile\nprivate void pushBasicProfile(JSONObject baseProfile) {\ntry {\n- String guid = this.deviceInfo.getDeviceID();\n+ String guid = getCleverTapID();\nJSONObject profileEvent = new JSONObject();\n@@ -3310,7 +3296,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nJSONObject event = new JSONObject();\nevent.put(\"profile\", profileEvent);\n- addErrorToEvent(\"Profile pushed from erroneous profile - \" +getCleverTapID());\n+ addErrorToEvent(\"Attempted to push profile for invalid custom CleverTap ID - \" +getCleverTapID());\nqueueEvent(context, event, Constants.PROFILE_EVENT);\n} catch (JSONException e) {\ngetConfigLogger().verbose(getAccountId(), \"FATAL: Creating basic profile update event failed!\");\n@@ -3321,7 +3307,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nprivate void cacheGUIDForIdentifier(String guid, String key, String identifier) {\n- if (guid == null || key == null || identifier == null) {\n+ if (guid == null || key == null || identifier == null || guid.equals(getFallbackDeviceID())) {\nreturn;\n}\n@@ -4922,13 +4908,14 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n//Check if GUID is present to avoid onUserLogin for error profiles\n- if(deviceInfo.getDeviceID() != null) {\n+ if(getFallbackDeviceID() != null) {\n// if no valid identifier provided or there are no identified users on the device; just push on the current profile\nif (!haveIdentifier || isAnonymousDevice()) {\ngetConfigLogger().debug(getAccountId(), \"onUserLogin: no identifier provided or device is anonymous, pushing on current user profile\");\npushProfile(profile);\nreturn;\n}\n+ }\n// if identifier maps to current guid, push on current profile\nif (cachedGUID != null && cachedGUID.equals(currentGUID)) {\n@@ -4936,7 +4923,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\npushProfile(profile);\nreturn;\n}\n- }\n// stringify profile to use as dupe blocker\nString profileToString = profile.toString();\n@@ -4960,7 +4946,15 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nfinal String guid = cachedGUID;\nfinal DeviceInfo _deviceInfo = this.deviceInfo;\n+ asyncProfileSwitchUser(profile,_deviceInfo,guid,cleverTapID);\n+\n+ } catch (Throwable t) {\n+ getConfigLogger().verbose(getAccountId(), \"onUserLogin failed\", t);\n+ }\n+\n+ }\n+ private void asyncProfileSwitchUser(final Map<String, Object> profile, final DeviceInfo _deviceInfo, final String guid, final String cleverTapID ){\npostAsyncSafely(\"resetProfile\", new Runnable() {\n@Override\npublic void run() {\n@@ -4998,6 +4992,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif(deviceInfo.getDeviceID() != null){\ndeviceInfo.removeDeviceID();\n}\n+ addErrorToEvent(\"Attempted to set invalid custom CleverTap ID - \"+cleverTapID+\" fallback to default error device ID : \" + getFallbackDeviceID());\n}else {\ngguid = _deviceInfo.forceNewDeviceID();\n}\n@@ -5016,6 +5011,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif(deviceInfo.getDeviceID() != null){\ndeviceInfo.removeDeviceID();\n}\n+ addErrorToEvent(\"Attempted to set invalid custom CleverTap ID - \"+cleverTapID+\" fallback to default error device ID : \" + getFallbackDeviceID());\n}\n}else {\ngguid = _deviceInfo.forceNewDeviceID();\n@@ -5025,7 +5021,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nsetCurrentUserOptOutStateFromStorage(); // be sure to call this after the guid is updated\nforcePushAppLaunchedEvent();\n+ if(profile !=null) {\npushProfile(profile);\n+ }\nforcePushDeviceToken(true);\nsynchronized (processingUserLoginLock) {\nprocessingUserLoginIdentifier = null;\n@@ -5036,11 +5034,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n});\n-\n- } catch (Throwable t) {\n- getConfigLogger().verbose(getAccountId(), \"onUserLogin failed\", t);\n- }\n-\n}\nprivate String getGUIDForIdentifier(String key, String identifier) {\n@@ -5819,13 +5812,21 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ngetConfigLogger().verbose(\"Storing Push Notification...\"+wzrk_pid + \" - with ttl - \"+ttl);\ndbAdapter.storePushNotificationId(wzrk_pid,wzrk_ttl);\nString wzrk_rnv = extras.getString(Constants.WZRK_RNV,\"\");\n+ String cid = extras.getString(Constants.WZRK_CHANNEL_ID, \"\");\nif(!wzrk_rnv.isEmpty()){\nif(config !=null && config.getRaiseNotificationViewed() && wzrk_rnv.equals(\"true\")){\n+ if (context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.O && !cid.isEmpty()){\n+ Logger.v(\"Raising Notification Viewed as per NB\");\n+ pushNotificationViewedEvent(extras);\n+ }else if(context.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.O) {\nLogger.v(\"Raising Notification Viewed as per NB\");\npushNotificationViewedEvent(extras);\n}else{\nLogger.v(\"Not raising Notification Viewed\");\n}\n+ }else{\n+ Logger.v(\"Not raising Notification Viewed\");\n+ }\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": "@@ -61,7 +61,6 @@ public class Constants {\nstatic final String INAPP_MAX_PER_SESSION = \"imc\";\nstatic final String INAPP_WINDOW = \"w\";\nstatic final String INAPP_KEY = \"inApp\";\n- static final String INAPP_IS_URL = \"iu\";\nstatic final int INAPP_CLOSE_IV_WIDTH = 40;\nstatic final String INAPP_JS_ENABLED = \"isJsEnabled\";\nstatic final String DEBUG_KEY = \"d\";\n@@ -117,7 +116,6 @@ public class Constants {\nstatic final String VIDEO_THUMBNAIL = \"ct_video_1\";\nstatic final String AUDIO_THUMBNAIL = \"ct_audio\";\nstatic final String IMAGE_PLACEHOLDER = \"ct_image\";\n- static final int LIST_VIEW_WIDTH = 450;\n//Keys used by the SDK\nstatic final String KEY_ACCOUNT_ID = \"accountId\";\nstatic final String KEY_ACCOUNT_TOKEN = \"accountToken\";\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": "@@ -11,7 +11,6 @@ import android.net.ConnectivityManager;\nimport android.net.NetworkInfo;\nimport android.os.Build;\nimport android.os.Handler;\n-import android.os.Looper;\nimport android.support.v4.app.NotificationManagerCompat;\nimport android.support.v4.content.ContextCompat;\nimport android.telephony.TelephonyManager;\n@@ -40,14 +39,14 @@ class DeviceInfo {\nDeviceInfo(Context context, CleverTapInstanceConfig config, String cleverTapID) {\nthis.context = context;\nthis.config = config;\n- this.handler = new Handler(Looper.myLooper());\n- Runnable deviceCacheInfoRunnable = new Runnable() {\n+ this.handler = new Handler();\n+ Thread deviceInfoCacheThread = new Thread(new Runnable() {\n@Override\npublic void run() {\n- getDeviceCachedInfo(); // put this here to avoid running on main thread\n+ getDeviceCachedInfo();\n}\n- };\n- handler.post(deviceCacheInfoRunnable);\n+ });\n+ deviceInfoCacheThread.start();\ninitDeviceID(cleverTapID);\n}\n@@ -88,42 +87,45 @@ class DeviceInfo {\n}\n//Validate the provided Custom CTID\n- boolean isCustomCTIDValid = false;\nif(ManifestInfo.getInstance(context).useCustomId()) {\n- isCustomCTIDValid = Utils.validateCTID(cleverTapID);\n- }\n-\n- //If validation is passed, update the GUID to provided custom CTID\n- if(isCustomCTIDValid) {\n+ if(Utils.validateCTID(cleverTapID)){\ngetConfigLogger().info(config.getAccountId(), \"Updating CleverTap ID to given custom CleverTap ID : \" + cleverTapID);\nforceUpdateDeviceId(Constants.CUSTOM_CLEVERTAP_ID_PREFIX+cleverTapID);\n}else{\n- Runnable deviceIDRunnable = new Runnable() {\n- @Override\n- public void run() {\n- // grab and cache the googleAdID in any event if available\n- cacheGoogleAdID();\n- //If Manifest flag is present then dont use Google Ad ID and create fallback ID\n- if(ManifestInfo.getInstance(context).useCustomId()){\nLogger.i(\"Since passed Custom CleverTap ID is not valid. Falling back to the error device id.\");\nif(getFallBackDeviceID() == null) {\nLogger.i(\"CleverTap will create a fallback device ID\");\ngenerateFallbackDeviceID();\n- }else{\n- Logger.i(\"Fallback device ID \"+ getFallBackDeviceID() +\" already exists, will not create a new fallback device ID\");\n- updateFallbackID(getFallBackDeviceID());\n}\n- }else {\n- //Generate Device ID\n+ }\n+ return;\n+ }\n+\n+ if(!ManifestInfo.getInstance(context).useGoogleAdId()){\ngenerateDeviceID();\n+ return;\n}\n+\n+ // fetch the googleAdID to generate GUID\n+ //has to be called on background thread\n+ Thread generateGUIDFromAdIDThread = new Thread(new Runnable() {\n+ @Override\n+ public void run() {\n+ fetchGoogleAdID();\n+ generateDeviceID();\n+\n+ SyncListener sl = CleverTapAPI.instanceWithConfig(context,config).getSyncListener();\n+ if(sl!=null){\n+ Logger.v(\"Calling profile did initialize\");\n+ sl.profileDidInitialize(getDeviceID());\n}\n- };\n- handler.post(deviceIDRunnable);\n}\n+ });\n+ generateGUIDFromAdIDThread.start();\n+\n}\n- private synchronized void cacheGoogleAdID() {\n+ private synchronized void fetchGoogleAdID() {\nif(this.config.isUseGoogleAdId() && googleAdID == null && !adIdRun) {\nString advertisingID = null;\n@@ -143,7 +145,7 @@ class DeviceInfo {\nMethod getAdId = adInfo.getClass().getMethod(\"getId\");\nadvertisingID = (String) getAdId.invoke(adInfo);\n} catch (Throwable t) {\n- getConfigLogger().verbose(config.getAccountId(), \"Failed to get Advertising ID: \" + t.toString());\n+ getConfigLogger().verbose(config.getAccountId(), \"Failed to get Advertising ID: \" + t.toString() + t.getCause().toString());\n}\nif (advertisingID != null && advertisingID.trim().length() > 2) {\nsynchronized (adIDLock) {\n@@ -182,6 +184,7 @@ class DeviceInfo {\nif (generatedDeviceID.trim().length() > 2) {\nforceUpdateDeviceId(generatedDeviceID);\n+\n} else {\ngetConfigLogger().verbose(this.config.getAccountId(),\"Unable to generate device ID\");\n}\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/HorizontalRectangleImageView.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk;\n-\n-import android.annotation.SuppressLint;\n-import android.content.Context;\n-import android.util.AttributeSet;\n-import android.widget.ImageView;\n-\n-@SuppressLint(\"AppCompatCustomView\")\n-public class HorizontalRectangleImageView extends ImageView {\n-\n- public HorizontalRectangleImageView(Context context) {\n- super(context);\n- }\n-\n- public HorizontalRectangleImageView(Context context, AttributeSet attrs) {\n- super(context, attrs);\n- }\n-\n- public HorizontalRectangleImageView(Context context, AttributeSet attrs, int defStyle) {\n- super(context, attrs, defStyle);\n- }\n-\n- @Override\n- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {\n- super.onMeasure(widthMeasureSpec, heightMeasureSpec);\n-\n-// float width = getMeasuredWidth()*0.5625f;\n-// int finalWidth = Math.round(width);\n-// //noinspection SuspiciousNameCombination\n-// setMeasuredDimension(getMeasuredWidth(), finalWidth);\n-\n- float width = getMeasuredHeight() * 1.76f;\n- int finalWidth = Math.round(width);\n- setMeasuredDimension(finalWidth,getMeasuredHeight());\n- }\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -64,8 +64,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nreturn;\n}\n- //Allow rotation for all InApps if Landscape version is present\n- //\n+ //Allow rotation for all InApps but respect the flags sent from dashboard\nif (inAppNotification.isPortrait() && !inAppNotification.isLandscape()) {\ntry {\nsetRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_icon_message_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_icon_message_layout.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\nandroid:orientation=\"vertical\" android:layout_width=\"match_parent\"\n- android:layout_height=\"match_parent\">\n+ android:layout_height=\"wrap_content\">\n<RelativeLayout\nandroid:layout_width=\"wrap_content\"\n- android:layout_height=\"match_parent\">\n-\n- <RelativeLayout\n- android:layout_width=\"wrap_content\"\n- android:layout_height=\"match_parent\"\n- android:id=\"@+id/click_relative_layout\"\n- android:layout_above=\"@id/cta_linear_layout\">\n+ android:layout_height=\"wrap_content\"\n+ android:id=\"@+id/click_relative_layout\">\n<LinearLayout\nandroid:id=\"@+id/body_linear_layout\"\nandroid:layout_width=\"match_parent\"\n- android:layout_height=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\nandroid:weightSum=\"2\">\n<RelativeLayout\nandroid:layout_height=\"wrap_content\"\nandroid:layout_weight=\"1\">\n- <com.clevertap.android.sdk.HorizontalRectangleImageView\n+ <com.clevertap.android.sdk.RectangleImageView\nandroid:id=\"@+id/media_image\"\n- android:layout_width=\"wrap_content\"\n- android:layout_height=\"match_parent\"\n- android:src=\"@drawable/ct_video_1\"\n- android:layout_centerInParent=\"true\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\nandroid:scaleType=\"fitCenter\"\nandroid:visibility=\"gone\" />\n<com.clevertap.android.sdk.HorizontalSquareImageView\nandroid:id=\"@+id/square_media_image\"\n- android:layout_width=\"match_parent\"\n- android:layout_height=\"wrap_content\"\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"200dp\"\nandroid:layout_centerInParent=\"true\"\nandroid:scaleType=\"centerCrop\"\nandroid:visibility=\"gone\" />\nandroid:textSize=\"14sp\"\nandroid:visibility=\"gone\" />\n</LinearLayout>\n- </RelativeLayout>\n+\n</LinearLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_simple_message_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_simple_message_layout.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\nandroid:orientation=\"vertical\" android:layout_width=\"match_parent\"\n- android:layout_height=\"match_parent\">\n+ android:layout_height=\"wrap_content\">\n<RelativeLayout\nandroid:layout_width=\"wrap_content\"\n- android:layout_height=\"match_parent\">\n-\n- <RelativeLayout\n- android:layout_width=\"wrap_content\"\n- android:layout_height=\"match_parent\"\n- android:id=\"@+id/click_relative_layout\"\n- android:layout_above=\"@+id/cta_linear_layout\">\n+ android:layout_height=\"wrap_content\"\n+ android:id=\"@+id/click_relative_layout\">\n<LinearLayout\nandroid:id=\"@+id/body_linear_layout\"\nandroid:layout_width=\"match_parent\"\n- android:layout_height=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\nandroid:weightSum=\"2\">\n<RelativeLayout\nandroid:id=\"@+id/media_layout\"\nandroid:visibility=\"visible\"\nandroid:layout_width=\"match_parent\"\n- android:layout_height=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\nandroid:layout_weight=\"1\">\n- <com.clevertap.android.sdk.HorizontalRectangleImageView\n+ <com.clevertap.android.sdk.RectangleImageView\nandroid:id=\"@+id/media_image\"\n- android:layout_width=\"wrap_content\"\n+ android:layout_width=\"match_parent\"\nandroid:scaleType=\"fitCenter\"\n- android:layout_centerInParent=\"true\"\n- android:layout_height=\"match_parent\"\n- android:visibility=\"visible\" />\n+ android:layout_height=\"wrap_content\"\n+ android:visibility=\"gone\" />\n<com.clevertap.android.sdk.HorizontalSquareImageView\nandroid:id=\"@+id/square_media_image\"\n- android:layout_width=\"match_parent\"\n+ android:layout_width=\"wrap_content\"\nandroid:scaleType=\"centerCrop\"\nandroid:layout_centerInParent=\"true\"\n- android:layout_height=\"wrap_content\"\n+ android:layout_height=\"200dp\"\nandroid:visibility=\"gone\" />\n<FrameLayout\n<RelativeLayout\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- android:layout_marginTop=\"40dp\"\n+ android:layout_marginTop=\"10dp\"\nandroid:layout_marginBottom=\"40dp\"\nandroid:layout_weight=\"1\">\nandroid:layout_below=\"@id/messageTitle\"\nandroid:layout_marginStart=\"10dp\"\nandroid:layout_marginLeft=\"10dp\"\n- android:layout_marginTop=\"15dp\"\n+ android:layout_marginTop=\"5dp\"\nandroid:layout_marginEnd=\"20dp\"\nandroid:layout_marginRight=\"20dp\"\nandroid:maxLines=\"3\"\nandroid:textSize=\"14sp\"\nandroid:visibility=\"gone\" />\n</LinearLayout>\n- </RelativeLayout>\n+\n</LinearLayout>\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Updating SDK version to v3.5.0 |
116,623 | 17.05.2019 18:04:13 | -19,080 | c9283d9952bc3953ff33724bfcdfbb155866047d | Final regex for setCleverTapID validation | [
{
"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": "@@ -4983,16 +4983,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nString gguid = null;\nif(cleverTapID == null) {\nif(ManifestInfo.getInstance(context).useCustomId()) {\n- if(getFallbackDeviceID() != null) {\n- gguid = getFallbackDeviceID();\n- }else{\n- _deviceInfo.generateFallbackDeviceID();\n- gguid = _deviceInfo.getFallBackDeviceID();\n- }\n- if(deviceInfo.getDeviceID() != null){\n- deviceInfo.removeDeviceID();\n- }\n- addErrorToEvent(\"Attempted to set invalid custom CleverTap ID - \"+cleverTapID+\" fallback to default error device ID : \" + getFallbackDeviceID());\n+ setFallBackDeviceIDForProfile(_deviceInfo,gguid,null);\n}else {\ngguid = _deviceInfo.forceNewDeviceID();\n}\n@@ -5002,16 +4993,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ngetConfigLogger().info(getAccountId(), \"Updating CleverTapID to given custom ID : \" + cleverTapID);\ngguid = _deviceInfo.forceUpdateDeviceId(Constants.CUSTOM_CLEVERTAP_ID_PREFIX+cleverTapID);\n}else{\n- if(_deviceInfo.getFallBackDeviceID() != null) {\n- gguid = _deviceInfo.getFallBackDeviceID();\n- }else{\n- _deviceInfo.generateFallbackDeviceID();\n- gguid = _deviceInfo.getFallBackDeviceID();\n- }\n- if(deviceInfo.getDeviceID() != null){\n- deviceInfo.removeDeviceID();\n- }\n- addErrorToEvent(\"Attempted to set invalid custom CleverTap ID - \"+cleverTapID+\" fallback to default error device ID : \" + getFallbackDeviceID());\n+ setFallBackDeviceIDForProfile(_deviceInfo,gguid,cleverTapID);\n}\n}else {\ngguid = _deviceInfo.forceNewDeviceID();\n@@ -5036,6 +5018,19 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n});\n}\n+ private void setFallBackDeviceIDForProfile(DeviceInfo _deviceInfo, String gguid, String cleverTapID ){\n+ if(getFallbackDeviceID() != null) {\n+ gguid = getFallbackDeviceID();\n+ }else{\n+ _deviceInfo.generateFallbackDeviceID();\n+ gguid = _deviceInfo.getFallBackDeviceID();\n+ }\n+ if(deviceInfo.getDeviceID() != null){\n+ deviceInfo.removeDeviceID();\n+ }\n+ addErrorToEvent(\"Attempted to set invalid custom CleverTap ID - \"+cleverTapID+\" fallback to default error device ID : \" + getFallbackDeviceID());\n+ }\n+\nprivate String getGUIDForIdentifier(String key, String identifier) {\nif (key == null || identifier == null) return null;\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": "@@ -250,8 +250,8 @@ final class Utils {\nLogger.i(\"Custom CleverTap ID passed is greater than 64 characters. \");\nreturn false;\n}\n- if(!cleverTapID.matches(\"[a-zA-Z0-9{}:()_!@#$%&-]*\")){\n- Logger.i(\"Custom CleverTap ID cannot contain special characters apart from {,},:,(,),_,!,@,#,$,&,% and - \");\n+ if(!cleverTapID.matches(\"[A-Za-z0-9()!:$@_-]*\")){\n+ Logger.i(\"Custom CleverTap ID cannot contain special characters apart from :,(,),_,!,@,$ and - \");\nreturn false;\n}\nreturn true;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Final regex for setCleverTapID validation |
116,623 | 18.05.2019 02:08:40 | -19,080 | edfcc038a9546b8cbd25b48e23d64f33c0de86c2 | Refactoring setCleverTapID flow and added error stream logging structure | [
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n+### Version 3.5.0 (May 17, 2019)\n+* Adds the ability to set a custom Device ID (CleverTap ID)\n+* Adds the ability to record Notification Viewed event for Push Notifications\n+* Adds support to record events in a WebView\n+* Enables Javascript in Custom HTML In-Apps\n+* In-Apps and App Inbox Landscape layout improvements\n+* Bug fixes and performance improvements\n+\n### Version 3.4.3 (April 4, 2019)\n* Adds support for specifying custom FCM Sender ID to request token\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.4.3'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.5.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.4.3', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.5.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.4.3'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.5.0'\nimplementation 'com.android.support:support-v4:28.0.0'\nimplementation 'com.google.firebase:firebase-messaging:17.3.0'\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' // Required only if you enable Google ADID collection in the SDK (turned off by default).\n"
},
{
"change_type": "MODIFY",
"old_path": "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": "@@ -150,13 +150,13 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nlayoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth() * 1.78f);\n} else {\nif (isTablet()) {\n- layoutParams.setMargins(85, 60, 85, 0);\n- layoutParams.width = (relativeLayout1.getMeasuredWidth()) - 85;\n- layoutHeight = layoutParams.height = (int) (layoutParams.width * 1.78f);\n+ layoutParams.setMargins(120, 40, 85, 0);\n+ layoutParams.width = (relativeLayout1.getMeasuredWidth()) - 75;\n+ layoutHeight = layoutParams.height = (int) (layoutParams.width * 0.5625f);\nrelativeLayout1.setLayoutParams(layoutParams);\nFrameLayout.LayoutParams closeLp = new FrameLayout.LayoutParams(closeImageView.getWidth(), closeImageView.getHeight());\ncloseLp.gravity = Gravity.TOP | Gravity.END;\n- closeLp.setMargins(0, 40, 65, 0);\n+ closeLp.setMargins(0, 20, 90, 0);\ncloseImageView.setLayoutParams(closeLp);\n} else {\nlayoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth() * 0.5625f);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTWebInterface.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTWebInterface.java",
"diff": "package com.clevertap.android.sdk;\n-import android.content.Context;\nimport android.webkit.JavascriptInterface;\nimport org.json.JSONArray;\n@@ -8,8 +7,6 @@ import org.json.JSONException;\nimport org.json.JSONObject;\nimport java.lang.ref.WeakReference;\n-import java.util.ArrayList;\n-import java.util.Map;\n/**\n* This class helps WebViews to interact with CleverTapAPI via pre-defined methods\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": "@@ -125,6 +125,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate static final Boolean pendingValidationResultsLock = true;\nprivate static CleverTapInstanceConfig defaultConfig;\nprivate static HashMap<String, CleverTapAPI> instances;\n+ static HashMap<String,ArrayList> instanceValidationResults;\n+ static ArrayList<ValidationResult> validationResultArrayList = new ArrayList<>();\nprivate static boolean appForeground = false;\nprivate static int activityCount = 0;\nprivate String currentScreenName = \"\";\n@@ -140,6 +142,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@SuppressWarnings({\"FieldCanBeLocal\", \"unused\"})\nprivate static String sdkVersion; // For Google Play Store/Android Studio analytics\n+ static void addValidationResultForInstanceCreation(String errorDescription){\n+ ValidationResult validationResult = new ValidationResult();\n+ validationResult.setErrorCode(514);\n+ validationResult.setErrorDesc(errorDescription);\n+ validationResultArrayList.add(validationResult);\n+ }\n/**\n* Method to check whether app has ExoPlayer dependencies\n* @return boolean - true/false depending on app's availability of ExoPlayer dependencies\n@@ -571,25 +579,24 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (instances == null) {\ninstances = new HashMap<>();\n}\n+ if(instanceValidationResults == null){\n+ instanceValidationResults = new HashMap<>();\n+ }\n+\nCleverTapAPI instance = instances.get(config.getAccountId());\nif (instance == null){\n- instance = new CleverTapAPI(context, config, cleverTapID);//Pass custom CTID to constructor\n+ instance = new CleverTapAPI(context, config, cleverTapID);\ninstances.put(config.getAccountId(), instance);\nif(instance.getCleverTapID() != null) {\ninstance.notifyUserProfileInitialized();\n- instance.addErrorToEvent(\"Attempted to set invalid custom CleverTap ID - \"+cleverTapID+\" fallback to default error device ID : \" + instance.getFallbackDeviceID());\n- }\n- }\n- else if(instance.getCleverTapID() != null){\n- if(instance.getCleverTapID().contains(Constants.ERROR_PROFILE_PREFIX) && cleverTapID != null) { //If Instance is created with NULL guid, update with correct guid if provided again\n- //Check if given CTID is valid or not and Manifest allows us to use it\n- if(ManifestInfo.getInstance(context).useCustomId()) {\n- if(Utils.validateCTID(cleverTapID)) {\n- Logger.i(\"Updating device ID after flushing events for the fallback device ID\");\n- instance.asyncProfileSwitchUser(null,instance.deviceInfo,null,cleverTapID);\n- }\n+ //TODO figure out logging\n+ instanceValidationResults.put(config.getAccountId(),validationResultArrayList);\n+ for(ValidationResult vr : validationResultArrayList){\n+ instance.pushValidationResult(vr);\n}\n}\n+ } else if(instance.isErrorDeviceId() && instance.getConfig().getEnableCustomCleverTapId() && Utils.validateCTID(cleverTapID)) {\n+ instance.asyncProfileSwitchUser(null,null,cleverTapID);\n}\nreturn instance;\n}\n@@ -695,8 +702,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ntry {\nevent.put(\"evtName\", Constants.APP_LAUNCHED_EVENT);\nevent.put(\"evtData\", getAppLaunchedFields());\n- addErrorToEvent(\"App Launched from erroneous profile - \" +getCleverTapID());\n-\n} catch (Throwable t) {\n// We won't get here\n}\n@@ -800,13 +805,15 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nfor (String accountId: CleverTapAPI.instances.keySet()) {\nCleverTapAPI instance = CleverTapAPI.instances.get(accountId);\n- if (instance.getConfig().isAnalyticsOnly()) {\n+ if (instance != null && instance.getConfig().isAnalyticsOnly()) {\nLogger.d(accountId, \"Instance is Analytics Only not processing device token\");\ncontinue;\n}\n+ if (instance != null) {\ninstance.onTokenRefresh();\n}\n}\n+ }\n//Push\nprivate void onTokenRefresh() {\n@@ -1281,6 +1288,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ngetConfigLogger().verbose(getAccountId(), \"Set current user OptOut state from storage to: \" + storedOptOut + \" for key: \" + key);\n}\n+ private boolean isErrorDeviceId(){\n+ return this.deviceInfo.isErrorDeviceId();\n+ }\n+\n//Util\n/**\n* Returns a unique identifier by which CleverTap identifies this user.\n@@ -1289,12 +1300,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n*/\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\npublic String getCleverTapID() {\n- return this.deviceInfo.getDeviceID() != null ? this.deviceInfo.getDeviceID() : this.deviceInfo.getFallBackDeviceID();\n+ return this.deviceInfo.getDeviceID();\n}\n- private String getFallbackDeviceID(){\n- return this.deviceInfo.getFallBackDeviceID();\n- }\n/**\n* Returns a unique CleverTap identifier suitable for use with install attribution providers.\n*\n@@ -1302,7 +1310,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n*/\n@SuppressWarnings(\"unused\")\npublic String getCleverTapAttributionIdentifier() {\n- return this.deviceInfo.getAttributionID() != null ? this.deviceInfo.getAttributionID() : this.deviceInfo.getFallBackDeviceID();\n+ return this.deviceInfo.getAttributionID();\n}\n/**\n@@ -1690,17 +1698,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn error;\n}\n- private void addErrorToEvent(String error){\n- if(getCleverTapID() != null) {\n- if (getCleverTapID().contains(Constants.ERROR_PROFILE_PREFIX)) {\n- ValidationResult validationResult = new ValidationResult();\n- validationResult.setErrorCode(514);\n- validationResult.setErrorDesc(error);\n- pushValidationResult(validationResult);\n- }\n- }\n- }\n-\n/**\n* Enables the Profile/Events Read and Synchronization API\n* Personalization is enabled by default\n@@ -2607,9 +2604,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate JSONArray getRenderedTargetList(){\nString[] pushIds = this.dbAdapter.fetchPushNotificationIds();\nJSONArray renderedTargets = new JSONArray();\n- for(int i=0;i<pushIds.length;i++){\n- Logger.v(\"RTL IDs -\"+pushIds[i]);\n- renderedTargets.put(pushIds[i]);\n+ for (String pushId : pushIds) {\n+ Logger.v(\"RTL IDs -\" + pushId);\n+ renderedTargets.put(pushId);\n}\nreturn renderedTargets;\n}\n@@ -3296,7 +3293,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nJSONObject event = new JSONObject();\nevent.put(\"profile\", profileEvent);\n- addErrorToEvent(\"Attempted to push profile for invalid custom CleverTap ID - \" +getCleverTapID());\nqueueEvent(context, event, Constants.PROFILE_EVENT);\n} catch (JSONException e) {\ngetConfigLogger().verbose(getAccountId(), \"FATAL: Creating basic profile update event failed!\");\n@@ -3307,7 +3303,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nprivate void cacheGUIDForIdentifier(String guid, String key, String identifier) {\n- if (guid == null || key == null || identifier == null || guid.equals(getFallbackDeviceID())) {\n+ if (isErrorDeviceId() || guid == null || key == null || identifier == null) {\nreturn;\n}\n@@ -4333,7 +4329,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nevent.put(\"evtName\", Constants.NOTIFICATION_CLICKED_EVENT_NAME);\nevent.put(\"evtData\", notif);\n- addErrorToEvent(\"Notification Clicked pushed from erroneous profile - \" +getCleverTapID());\nqueueEvent(context, event, Constants.RAISED_EVENT);\ntry {\n@@ -4626,7 +4621,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n} catch (Throwable ignored) {\n//no-op\n}\n- addErrorToEvent(\"Notification Viewed pushed from erroneous profile - \" +getCleverTapID());\nqueueEvent(context, event, Constants.NV_EVENT);\n}\n@@ -4833,7 +4827,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n*/\n@SuppressWarnings(\"unused\")\npublic void onUserLogin(final Map<String, Object> profile, final String cleverTapID) {\n- if(ManifestInfo.getInstance(context).useCustomId()){\n+ if(getConfig().getEnableCustomCleverTapId()){\nif(cleverTapID == null){\nLogger.i(\"CLEVERTAP_USE_CUSTOM_ID has been specified in the AndroidManifest.xml Please call onUserlogin() and pass a custom CleverTap ID\");\n}\n@@ -4895,7 +4889,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nObject value = profile.get(key);\nif (Constants.PROFILE_IDENTIFIER_KEYS.contains(key)) {\ntry {\n- String identifier = value.toString();\n+ String identifier = null;\n+ if (value != null) {\n+ identifier = value.toString();\n+ }\nif (identifier != null && identifier.length() > 0) {\nhaveIdentifier = true;\ncachedGUID = getGUIDForIdentifier(key, identifier);\n@@ -4907,9 +4904,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n- //Check if GUID is present to avoid onUserLogin for error profiles\n- if(getFallbackDeviceID() != null) {\n// if no valid identifier provided or there are no identified users on the device; just push on the current profile\n+ if(!isErrorDeviceId()) {\nif (!haveIdentifier || isAnonymousDevice()) {\ngetConfigLogger().debug(getAccountId(), \"onUserLogin: no identifier provided or device is anonymous, pushing on current user profile\");\npushProfile(profile);\n@@ -4942,19 +4938,14 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ngetConfigLogger().verbose(getAccountId(), \"onUserLogin: queuing reset profile for \" + profileToString\n+ \" with Cached GUID \" + ((cachedGUID != null) ? cachedGUID : \"NULL\"));\n-\n- final String guid = cachedGUID;\n-\n- final DeviceInfo _deviceInfo = this.deviceInfo;\n- asyncProfileSwitchUser(profile,_deviceInfo,guid,cleverTapID);\n+ asyncProfileSwitchUser(profile,cachedGUID,cleverTapID);\n} catch (Throwable t) {\ngetConfigLogger().verbose(getAccountId(), \"onUserLogin failed\", t);\n}\n-\n}\n- private void asyncProfileSwitchUser(final Map<String, Object> profile, final DeviceInfo _deviceInfo, final String guid, final String cleverTapID ){\n+ private void asyncProfileSwitchUser(final Map<String, Object> profile, final String cacheGuid, final String cleverTapID ){\npostAsyncSafely(\"resetProfile\", new Runnable() {\n@Override\npublic void run() {\n@@ -4976,31 +4967,15 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ndestroySession();\n// either force restore the cached GUID or generate a new one\n- if (guid != null) {\n- _deviceInfo.forceUpdateDeviceId(guid);\n- notifyUserProfileInitialized(guid);\n+ if (cacheGuid != null) {\n+ deviceInfo.forceUpdateDeviceId(cacheGuid);\n+ notifyUserProfileInitialized(cacheGuid);\n+ } else if(getConfig().getEnableCustomCleverTapId()) {\n+ deviceInfo.forceUpdateCustomCleverTapID(cleverTapID);\n}else {\n- String gguid = null;\n- if(cleverTapID == null) {\n- if(ManifestInfo.getInstance(context).useCustomId()) {\n- setFallBackDeviceIDForProfile(_deviceInfo,gguid,null);\n- }else {\n- gguid = _deviceInfo.forceNewDeviceID();\n- }\n- }else{\n- if(ManifestInfo.getInstance(context).useCustomId()) {\n- if(Utils.validateCTID(cleverTapID)) {\n- getConfigLogger().info(getAccountId(), \"Updating CleverTapID to given custom ID : \" + cleverTapID);\n- gguid = _deviceInfo.forceUpdateDeviceId(Constants.CUSTOM_CLEVERTAP_ID_PREFIX+cleverTapID);\n- }else{\n- setFallBackDeviceIDForProfile(_deviceInfo,gguid,cleverTapID);\n- }\n- }else {\n- gguid = _deviceInfo.forceNewDeviceID();\n- }\n- }\n- notifyUserProfileInitialized(gguid);\n+ deviceInfo.forceNewDeviceID();\n}\n+ notifyUserProfileInitialized(getCleverTapID());\nsetCurrentUserOptOutStateFromStorage(); // be sure to call this after the guid is updated\nforcePushAppLaunchedEvent();\nif(profile !=null) {\n@@ -5018,19 +4993,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n});\n}\n- private void setFallBackDeviceIDForProfile(DeviceInfo _deviceInfo, String gguid, String cleverTapID ){\n- if(getFallbackDeviceID() != null) {\n- gguid = getFallbackDeviceID();\n- }else{\n- _deviceInfo.generateFallbackDeviceID();\n- gguid = _deviceInfo.getFallBackDeviceID();\n- }\n- if(deviceInfo.getDeviceID() != null){\n- deviceInfo.removeDeviceID();\n- }\n- addErrorToEvent(\"Attempted to set invalid custom CleverTap ID - \"+cleverTapID+\" fallback to default error device ID : \" + getFallbackDeviceID());\n- }\n-\nprivate String getGUIDForIdentifier(String key, String identifier) {\nif (key == null || identifier == null) return null;\n@@ -5148,7 +5110,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ndata.put(\"type\", type.toString());\nevent.put(\"data\", data);\ngetConfigLogger().verbose(getAccountId(), \"DataHandler: pushing device token with action \" + action + \" and type \" + type.toString());\n- addErrorToEvent(\"FCM Device Token pushed from erroneous profile - \" +getCleverTapID());\nqueueEvent(context, event, Constants.DATA_EVENT);\n} catch (JSONException e) {\n// we won't get here\n@@ -5272,6 +5233,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n+ //To be called from DeviceInfo AdID GUID generation\n+ void deviceIDCreated(String deviceId){\n+ getConfigLogger().verbose(\"Got device id from DeviceInfo, notifying user profile initialized to SyncListener\");\n+ notifyUserProfileInitialized(deviceId);\n+ }\n+\nprivate void notifyUserProfileInitialized(){\nnotifyUserProfileInitialized(this.deviceInfo.getDeviceID());\n}\n@@ -5809,18 +5776,18 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nString wzrk_rnv = extras.getString(Constants.WZRK_RNV,\"\");\nString cid = extras.getString(Constants.WZRK_CHANNEL_ID, \"\");\nif(!wzrk_rnv.isEmpty()){\n- if(config !=null && config.getRaiseNotificationViewed() && wzrk_rnv.equals(\"true\")){\n+ if(getConfig() !=null && getConfig().getRaiseNotificationViewed() && wzrk_rnv.equals(\"true\")){\nif (context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.O && !cid.isEmpty()){\n- Logger.v(\"Raising Notification Viewed as per NB\");\n+ getConfigLogger().verbose(\"Raising Notification Viewed as per NB\");\npushNotificationViewedEvent(extras);\n}else if(context.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.O) {\n- Logger.v(\"Raising Notification Viewed as per NB\");\n+ getConfigLogger().verbose(\"Raising Notification Viewed as per NB\");\npushNotificationViewedEvent(extras);\n}else{\n- Logger.v(\"Not raising Notification Viewed\");\n+ getConfigLogger().verbose(\"Not raising Notification Viewed\");\n}\n}else{\n- Logger.v(\"Not raising Notification Viewed\");\n+ getConfigLogger().verbose(\"Not raising Notification Viewed\");\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"diff": "@@ -220,6 +220,10 @@ public class CleverTapInstanceConfig implements Parcelable {\nreturn disableAppLaunchedEvent;\n}\n+ public void setDisableAppLaunchedEvent(boolean disableAppLaunchedEvent) {\n+ this.disableAppLaunchedEvent = disableAppLaunchedEvent;\n+ }\n+\nboolean isSslPinningEnabled() {\nreturn sslPinning;\n}\n@@ -269,10 +273,14 @@ public class CleverTapInstanceConfig implements Parcelable {\nreturn raiseNotificationViewed;\n}\n- public boolean getEnableCustomCleverTapId() {\n+ boolean getEnableCustomCleverTapId() {\nreturn enableCustomCleverTapId;\n}\n+ public void setEnableCustomCleverTapId(boolean enableCustomCleverTapId) {\n+ this.enableCustomCleverTapId = enableCustomCleverTapId;\n+ }\n+\npublic String getFCMSenderId() {\nreturn fcmSenderId;\n}\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": "@@ -10,7 +10,6 @@ import android.content.pm.PackageManager;\nimport android.net.ConnectivityManager;\nimport android.net.NetworkInfo;\nimport android.os.Build;\n-import android.os.Handler;\nimport android.support.v4.app.NotificationManagerCompat;\nimport android.support.v4.content.ContextCompat;\nimport android.telephony.TelephonyManager;\n@@ -34,12 +33,10 @@ class DeviceInfo {\nprivate boolean adIdRun = false;\nprivate static final String OS_NAME = \"Android\";\nprivate DeviceCachedInfo cachedInfo;\n- private Handler handler;\nDeviceInfo(Context context, CleverTapInstanceConfig config, String cleverTapID) {\nthis.context = context;\nthis.config = config;\n- this.handler = new Handler();\nThread deviceInfoCacheThread = new Thread(new Runnable() {\n@Override\npublic void run() {\n@@ -76,32 +73,23 @@ class DeviceInfo {\n@SuppressWarnings({\"WeakerAccess\"})\nprivate void initDeviceID(String cleverTapID) {\n-\n- String deviceID = getDeviceID();\n+ String deviceID = _getDeviceID();\nif(deviceID != null && deviceID.trim().length() > 2){\n- getConfigLogger().info(config.getAccountId(),\"CleverTap ID already present for profile\");\n+ getConfigLogger().verbose(config.getAccountId(),\"CleverTap ID already present for profile\");\nif(cleverTapID != null) {\n- getConfigLogger().info(config.getAccountId(),\"Discarding custom CleverTap ID - \" + cleverTapID);\n+ getConfigLogger().info(config.getAccountId(),\"CleverTap ID already present for profile. Discarding custom CleverTap ID - \" + cleverTapID);\n+ //TODO Log this to dashboard??\n+ CleverTapAPI.addValidationResultForInstanceCreation(\"Inside initDeviceID - CleverTap ID already present for profile. Discarding custom CleverTap ID - \" + cleverTapID);\n}\nreturn;\n}\n- //Validate the provided Custom CTID\n- if(ManifestInfo.getInstance(context).useCustomId()) {\n- if(Utils.validateCTID(cleverTapID)){\n- getConfigLogger().info(config.getAccountId(), \"Updating CleverTap ID to given custom CleverTap ID : \" + cleverTapID);\n- forceUpdateDeviceId(Constants.CUSTOM_CLEVERTAP_ID_PREFIX+cleverTapID);\n- }else{\n- Logger.i(\"Since passed Custom CleverTap ID is not valid. Falling back to the error device id.\");\n- if(getFallBackDeviceID() == null) {\n- Logger.i(\"CleverTap will create a fallback device ID\");\n- generateFallbackDeviceID();\n- }\n- }\n+ if(this.config.getEnableCustomCleverTapId()) {\n+ forceUpdateCustomCleverTapID(cleverTapID);\nreturn;\n}\n- if(!ManifestInfo.getInstance(context).useGoogleAdId()){\n+ if(this.config.isUseGoogleAdId()){\ngenerateDeviceID();\nreturn;\n}\n@@ -113,21 +101,31 @@ class DeviceInfo {\npublic void run() {\nfetchGoogleAdID();\ngenerateDeviceID();\n-\n- SyncListener sl = CleverTapAPI.instanceWithConfig(context,config).getSyncListener();\n- if(sl!=null){\n- Logger.v(\"Calling profile did initialize\");\n- sl.profileDidInitialize(getDeviceID());\n- }\n+ CleverTapAPI.instanceWithConfig(context,config).deviceIDCreated(getDeviceID());\n}\n});\ngenerateGUIDFromAdIDThread.start();\n+ }\n+ void forceUpdateCustomCleverTapID(String cleverTapID){\n+ if(Utils.validateCTID(cleverTapID)){\n+ getConfigLogger().info(config.getAccountId(), \"Setting CleverTap ID to custom CleverTap ID : \" + cleverTapID);\n+ forceUpdateDeviceId(Constants.CUSTOM_CLEVERTAP_ID_PREFIX+cleverTapID);\n+ }else if(getFallBackDeviceID() == null) {\n+ generateFallbackDeviceID();\n+ removeDeviceID();\n+ }\n+ getConfigLogger().info(config.getAccountId(),\"Custom CleverTap ID - \"+cleverTapID+\" is not valid. Falling back to the error device id - \"+ getFallBackDeviceID());\n+ //TODO Log this to dashboard??\n+ CleverTapAPI.addValidationResultForInstanceCreation(\"Inside forceUpdateCustomCleverTapID - Custom CleverTap ID - \"+cleverTapID+\" is not valid. Falling back to the error device id - \"+ getFallBackDeviceID());\n}\n- private synchronized void fetchGoogleAdID() {\n+ boolean isErrorDeviceId(){\n+ return getDeviceID() != null && getDeviceID().startsWith(Constants.ERROR_PROFILE_PREFIX);\n+ }\n- if(this.config.isUseGoogleAdId() && googleAdID == null && !adIdRun) {\n+ private synchronized void fetchGoogleAdID() {\n+ if(getGoogleAdID() == null && !adIdRun) {\nString advertisingID = null;\ntry {\nadIdRun = true;\n@@ -155,7 +153,7 @@ class DeviceInfo {\n}\n}\n- synchronized void generateFallbackDeviceID(){\n+ private synchronized void generateFallbackDeviceID(){\nsynchronized (deviceIDLock) {\nString fallbackDeviceID = Constants.ERROR_PROFILE_PREFIX + UUID.randomUUID().toString().replace(\"-\", \"\");\nif (fallbackDeviceID.trim().length() > 2) {\n@@ -168,36 +166,26 @@ class DeviceInfo {\nprivate synchronized void generateDeviceID() {\nString generatedDeviceID;\n-\n- // try google ad id first\n- // if no ad id then make provisional guid permanent\n- if (googleAdID != null && ManifestInfo.getInstance(context).useGoogleAdId()) {\n- synchronized (adIDLock) {\n- generatedDeviceID = Constants.GUID_PREFIX_GOOGLE_AD_ID + googleAdID;\n- }\n+ String adId = getGoogleAdID();\n+ if (adId != null) {\n+ generatedDeviceID = Constants.GUID_PREFIX_GOOGLE_AD_ID + adId;\n}else{\nsynchronized (deviceIDLock) {\ngeneratedDeviceID = generateGUID();\n- getConfigLogger().verbose(this.config.getAccountId(),\"Made provisional ID permanent\");\n}\n}\n-\n- if (generatedDeviceID.trim().length() > 2) {\nforceUpdateDeviceId(generatedDeviceID);\n-\n- } else {\n- getConfigLogger().verbose(this.config.getAccountId(),\"Unable to generate device ID\");\n- }\n}\nString getAttributionID() {\n- String deviceID = getDeviceID();\n- synchronized (deviceIDLock) {\n- return (deviceID != null && deviceID.trim().length() > 2) ? deviceID : null;\n- }\n+ return getDeviceID();\n}\nString getDeviceID() {\n+ return _getDeviceID() != null ? _getDeviceID() : getFallBackDeviceID();\n+ }\n+\n+ private String _getDeviceID(){\nsynchronized (deviceIDLock) {\nif (this.config.isDefaultInstance()) {\nString _new = StorageHelper.getString(this.context, getDeviceIdStorageKey(), null);\n@@ -208,11 +196,11 @@ class DeviceInfo {\n}\n}\n- void removeDeviceID(){\n+ private void removeDeviceID(){\nStorageHelper.removeString(this.context, getDeviceIdStorageKey());\n}\n- String getFallBackDeviceID(){\n+ private String getFallBackDeviceID(){\nreturn StorageHelper.getString(this.context, getFallbackIdStorageKey(), null);\n}\n@@ -220,10 +208,9 @@ class DeviceInfo {\nreturn GUID_PREFIX + UUID.randomUUID().toString().replace(\"-\", \"\");\n}\n-\n- String forceNewDeviceID() {\n+ void forceNewDeviceID() {\nString deviceID = generateGUID();\n- return forceUpdateDeviceId(deviceID);\n+ forceUpdateDeviceId(deviceID);\n}\nprivate String getDeviceIdStorageKey() {\n@@ -234,10 +221,9 @@ class DeviceInfo {\nreturn Constants.FALLBACK_ID_TAG +\":\"+this.config.getAccountId();\n}\n- String updateFallbackID(String fallbackId){\n+ private void updateFallbackID(String fallbackId){\ngetConfigLogger().verbose(this.config.getAccountId(),\"Updating the fallback id - \" + fallbackId);\nStorageHelper.putString(context, getFallbackIdStorageKey(), fallbackId);\n- return fallbackId;\n}\n/**\n@@ -249,12 +235,11 @@ class DeviceInfo {\n* @param id The new device ID\n*/\n@SuppressLint(\"CommitPrefEdits\")\n- String forceUpdateDeviceId(String id) {\n+ void forceUpdateDeviceId(String id) {\ngetConfigLogger().verbose(this.config.getAccountId(),\"Force updating the device ID to \" + id);\nsynchronized (deviceIDLock) {\nStorageHelper.putString(context, getDeviceIdStorageKey(), id);\n}\n- return id;\n}\n/**\n* Tests whether a particular permission is available or not.\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/VerticalSpaceItemDecoration.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/VerticalSpaceItemDecoration.java",
"diff": "@@ -8,7 +8,7 @@ public class VerticalSpaceItemDecoration extends RecyclerView.ItemDecoration {\nprivate final int verticalSpaceHeight;\n- public VerticalSpaceItemDecoration(int verticalSpaceHeight) {\n+ VerticalSpaceItemDecoration(int verticalSpaceHeight) {\nthis.verticalSpaceHeight = verticalSpaceHeight;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Refactoring setCleverTapID flow and added error stream logging structure |
116,623 | 18.05.2019 09:03:34 | -19,080 | bdb1e1b40ea80936701969b58fcdff259ca0f5e5 | error stream logging 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": "@@ -515,18 +515,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// For Google Play Store/Android Studio tracking\nsdkVersion = BuildConfig.SDK_VERSION_STRING;\n- //Show logging as per Manifest flag\n- if(ManifestInfo.getInstance(context).useCustomId()){\n- if(cleverTapID == null){\n- Logger.i(\"CLEVERTAP_USE_CUSTOM_ID has been specified in the AndroidManifest.xml CleverTap SDK will create a fallback device ID\");\n- }\n- }else{\n- if(cleverTapID != null){\n- Logger.i(\"CLEVERTAP_USE_CUSTOM_ID has not been specified in the AndroidManifest.xml. Custom CleverTap ID passed will not be used.\");\n- }\n- }\n-\n- //Create defaultConfig nonetheless\nif(defaultConfig != null){\nreturn instanceWithConfig(context,defaultConfig,cleverTapID);\n}\n@@ -589,7 +577,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ninstances.put(config.getAccountId(), instance);\nif(instance.getCleverTapID() != null) {\ninstance.notifyUserProfileInitialized();\n- //TODO figure out logging\ninstanceValidationResults.put(config.getAccountId(),validationResultArrayList);\nfor(ValidationResult vr : validationResultArrayList){\ninstance.pushValidationResult(vr);\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": "@@ -73,13 +73,25 @@ class DeviceInfo {\n@SuppressWarnings({\"WeakerAccess\"})\nprivate void initDeviceID(String cleverTapID) {\n+ //Show logging as per Manifest flag\n+ if(config.getEnableCustomCleverTapId()){\n+ if(cleverTapID == null){\n+ config.getLogger().info(\"CLEVERTAP_USE_CUSTOM_ID has been specified in the AndroidManifest.xml/Instance Configuration. CleverTap SDK will create a fallback device ID\");\n+ CleverTapAPI.addValidationResultForInstanceCreation(\"CLEVERTAP_USE_CUSTOM_ID has been specified in the AndroidManifest.xml/Instance Configuration. CleverTap SDK will create a fallback device ID\");\n+ }\n+ }else{\n+ if(cleverTapID != null){\n+ config.getLogger().info(\"CLEVERTAP_USE_CUSTOM_ID has not been specified in the AndroidManifest.xml. Custom CleverTap ID passed will not be used.\");\n+ CleverTapAPI.addValidationResultForInstanceCreation(\"CLEVERTAP_USE_CUSTOM_ID has not been specified in the AndroidManifest.xml. Custom CleverTap ID passed will not be used.\");\n+ }\n+ }\n+\nString deviceID = _getDeviceID();\nif(deviceID != null && deviceID.trim().length() > 2){\ngetConfigLogger().verbose(config.getAccountId(),\"CleverTap ID already present for profile\");\nif(cleverTapID != null) {\n- getConfigLogger().info(config.getAccountId(),\"CleverTap ID already present for profile. Discarding custom CleverTap ID - \" + cleverTapID);\n- //TODO Log this to dashboard??\n- CleverTapAPI.addValidationResultForInstanceCreation(\"Inside initDeviceID - CleverTap ID already present for profile. Discarding custom CleverTap ID - \" + cleverTapID);\n+ getConfigLogger().info(config.getAccountId(),\"CleverTap ID - \"+deviceID+\" already exists. Unable to set custom CleverTap ID - \" + cleverTapID);\n+ CleverTapAPI.addValidationResultForInstanceCreation(\"CleverTap ID - \"+deviceID+\" already exists. Unable to set custom CleverTap ID - \" + cleverTapID);\n}\nreturn;\n}\n@@ -111,13 +123,12 @@ class DeviceInfo {\nif(Utils.validateCTID(cleverTapID)){\ngetConfigLogger().info(config.getAccountId(), \"Setting CleverTap ID to custom CleverTap ID : \" + cleverTapID);\nforceUpdateDeviceId(Constants.CUSTOM_CLEVERTAP_ID_PREFIX+cleverTapID);\n- }else if(getFallBackDeviceID() == null) {\n- generateFallbackDeviceID();\n+ }else {\n+ setOrGenerateFallbackDeviceID();\nremoveDeviceID();\n+ getConfigLogger().info(config.getAccountId(),\"Attempted to set invalid custom CleverTap ID - \"+cleverTapID+\", falling back to default error CleverTap ID - \"+getFallBackDeviceID());\n+ CleverTapAPI.addValidationResultForInstanceCreation(\"Attempted to set invalid custom CleverTap ID - \"+cleverTapID+\", falling back to default error CleverTap ID - \"+getFallBackDeviceID());\n}\n- getConfigLogger().info(config.getAccountId(),\"Custom CleverTap ID - \"+cleverTapID+\" is not valid. Falling back to the error device id - \"+ getFallBackDeviceID());\n- //TODO Log this to dashboard??\n- CleverTapAPI.addValidationResultForInstanceCreation(\"Inside forceUpdateCustomCleverTapID - Custom CleverTap ID - \"+cleverTapID+\" is not valid. Falling back to the error device id - \"+ getFallBackDeviceID());\n}\nboolean isErrorDeviceId(){\n@@ -153,7 +164,8 @@ class DeviceInfo {\n}\n}\n- private synchronized void generateFallbackDeviceID(){\n+ private synchronized void setOrGenerateFallbackDeviceID(){\n+ if(getFallBackDeviceID() == null) {\nsynchronized (deviceIDLock) {\nString fallbackDeviceID = Constants.ERROR_PROFILE_PREFIX + UUID.randomUUID().toString().replace(\"-\", \"\");\nif (fallbackDeviceID.trim().length() > 2) {\n@@ -163,6 +175,7 @@ class DeviceInfo {\n}\n}\n}\n+ }\nprivate synchronized void generateDeviceID() {\nString generatedDeviceID;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | error stream logging changes |
116,623 | 18.05.2019 11:39:30 | -19,080 | c00f6c037e57cbd29ba8ef0f334111a27ab8b1b3 | Preparing for release v3.5.0 | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/build.gradle",
"new_path": "AndroidStarter/app/build.gradle",
"diff": "@@ -29,14 +29,14 @@ 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.4.3', ext: 'aar') //CleverTap Android SDK, make sure the AAR file is in the libs folder\n+ implementation (name: 'clevertap-android-sdk-3.5.0', ext: 'aar') //CleverTap Android SDK, make sure the AAR file is in the libs folder\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\nimplementation 'com.google.android.exoplayer:exoplayer:2.8.4'\nimplementation 'com.google.android.exoplayer:exoplayer-hls:2.8.4'\nimplementation 'com.google.android.exoplayer:exoplayer-ui:2.8.4'\n- implementation 'com.github.bumptech.glide:glide:4.8.0'//Mandatory if you are using Notification inbox\n+ implementation '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}\n"
},
{
"change_type": "DELETE",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.4.3.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.4.3.aar",
"diff": "Binary files a/AndroidStarter/app/libs/clevertap-android-sdk-3.4.3.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.5.0.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.5.0.aar",
"diff": "Binary files /dev/null and b/AndroidStarter/app/libs/clevertap-android-sdk-3.5.0.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/src/main/AndroidManifest.xml",
"new_path": "AndroidStarter/app/src/main/AndroidManifest.xml",
"diff": "android:name=\"CLEVERTAP_BACKGROUND_SYNC\"\nandroid:value=\"1\"/>\n+ <!--Add meta and set to 1 to raise Notification Viewed for Push Notifications-->\n+ <meta-data\n+ android:name=\"CLEVERTAP_RAISE_NOTIFICATION_VIEWED\"\n+ android:value=\"1\"/>\n+\n+ <!--Add meta and set to 1 start using custom CleverTap ID-->\n+ <meta-data\n+ android:name=\"CLEVERTAP_USE_CUSTOM_ID\"\n+ android:value=\"1\"/>\n+\n<!-- Add CleverTap Push Notification Services & Install Referrer Receivers-->\n<service\nandroid:name=\"com.clevertap.android.sdk.FcmTokenListenerService\" android:exported=\"true\">\n</intent-filter>\n</receiver>\n- <!-- Add CleverTap Push In App Notification Activity-->\n- <activity\n- android:name=\"com.clevertap.android.sdk.InAppNotificationActivity\"\n- android:theme=\"@android:style/Theme.Translucent.NoTitleBar\"\n- android:configChanges=\"orientation|keyboardHidden\"/>\n+ <activity android:name=\".WebViewActivity\" />\n</application>\n</manifest>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "AndroidStarter/app/src/main/assets/sampleHTMLCode.html",
"diff": "+\n+<html>\n+ <title>\n+ my title\n+ </title>\n+\n+ <body>\n+ <button onclick='invokeEvent()'>Push Event</button><br/><br/>\n+ <button onclick='invokeEventWithProps()'>Push Event Props</button><br/><br/>\n+ <button onclick='invokePushProfile()'>Push Profile</button><br/><br/>\n+ <button onclick='invokeAddProp()'>Add Property</button><br/><br/>\n+ <button onclick='invokeAddMultiProps()'>Add Multivalues</button><br/><br/>\n+ <button onclick='invokeRemoveProp()'>Remove Property</button><br/><br/>\n+ <button onclick='invokeRemoveMultiProps()'>Remove Multivalues</button><br/><br/>\n+ <button onclick='invokeRemoveForKey()'>Remove for key</button><br/><br/>\n+ <button onclick='invokeSetMultiValue()'>Set Multivalues</button><br/><br/>\n+ <script>\n+ console.log('LOG')\n+ function invokeEvent() {\n+ CleverTap.pushEvent('WebView button clicked')\n+ }\n+ function invokeEventWithProps(){\n+ var props = {foo: 'xyz', lang: 'French'};\n+ CleverTap.pushEvent('WebView button clicked',JSON.stringify(props))\n+ }\n+ function invokePushProfile() {\n+ var props = {foo: 'xyz', lang: 'French'};\n+ CleverTap.pushProfile(JSON.stringify(props))\n+ }\n+ function invokeAddProp(){\n+ CleverTap.addMultiValueForKey('bar', 'abcd');\n+ }\n+ function invokeAddMultiProps(){\n+ var cars = ['Saab', 'Volvo', 'BMW', 'Kia'];\n+ CleverTap.addMultiValuesForKey('foobar', JSON.stringify(cars));\n+ }\n+ function invokeRemoveProp(){\n+ CleverTap.removeMultiValueForKey('foobar', 'Saab');\n+ }\n+ function invokeRemoveMultiProps(){\n+ var cars = [\"Volvo\", \"BMW\"];\n+ CleverTap.removeMultiValuesForKey('foobar', JSON.stringify(cars));\n+ }\n+ function invokeRemoveForKey(){\n+ CleverTap.removeValueForKey('bar');\n+ }\n+ function invokeSetMultiValue(){\n+ var values = ['xyz123','xyz1234']\n+ CleverTap.setMultiValueForKey('foo', JSON.stringify(values));\n+ }\n+ </script>\n+ </body>\n+</html>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/src/main/java/com/clevertap/demo/MainActivity.java",
"new_path": "AndroidStarter/app/src/main/java/com/clevertap/demo/MainActivity.java",
"diff": "package com.clevertap.demo;\n+import android.content.Intent;\nimport android.support.v7.app.AppCompatActivity;\nimport android.os.Bundle;\nimport android.view.View;\n@@ -17,7 +18,7 @@ import java.util.HashMap;\npublic class MainActivity extends AppCompatActivity implements CTInboxListener {\n- private Button event, chargedEvent, eventWithProps, profileEvent, inbox;\n+ private Button event, chargedEvent, eventWithProps, profileEvent, inbox,web;\nprivate CleverTapAPI cleverTapDefaultInstance, cleverTapInstanceTwo;\n@Override\nprotected void onCreate(Bundle savedInstanceState) {\n@@ -28,6 +29,7 @@ public class MainActivity extends AppCompatActivity implements CTInboxListener {\neventWithProps = findViewById(R.id.event_with_props);\nprofileEvent = findViewById(R.id.profile_event);\ninbox = findViewById(R.id.inbox);\n+ web = findViewById(R.id.web);\n//Set Debug level for CleverTap\nCleverTapAPI.setDebugLevel(3);\n@@ -136,6 +138,12 @@ public class MainActivity extends AppCompatActivity implements CTInboxListener {\n}\n});\n+ web.setOnClickListener(new View.OnClickListener() {\n+ @Override\n+ public void onClick(View v) {\n+ startActivity(new Intent(MainActivity.this,WebViewActivity.class));\n+ }\n+ });\n}\n@Override\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "AndroidStarter/app/src/main/java/com/clevertap/demo/WebViewActivity.java",
"diff": "+package com.clevertap.demo;\n+\n+import android.annotation.SuppressLint;\n+import android.app.Activity;\n+import android.os.Build;\n+import android.os.Bundle;\n+import android.support.annotation.RequiresApi;\n+import android.webkit.WebView;\n+\n+import com.clevertap.android.sdk.CTWebInterface;\n+import com.clevertap.android.sdk.CleverTapAPI;\n+\n+public class WebViewActivity extends Activity {\n+ @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)\n+ @SuppressLint({\"SetJavaScriptEnabled\", \"AddJavascriptInterface\"})\n+ @Override\n+ protected void onCreate (Bundle savedInstanceState) {\n+ super.onCreate(savedInstanceState);\n+ setContentView(R.layout.webview);\n+ WebView webView = findViewById(R.id.webview);\n+ webView.getSettings().setJavaScriptEnabled(true);\n+ webView.loadUrl(\"file:///android_asset/sampleHTMLCode.html\");\n+ webView.getSettings().setAllowContentAccess(false);\n+ webView.getSettings().setAllowFileAccess(false);\n+ webView.getSettings().setAllowFileAccessFromFileURLs(false);\n+ webView.addJavascriptInterface(new CTWebInterface(CleverTapAPI.getDefaultInstance(this)),\"CleverTap\");\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/src/main/res/layout/activity_main.xml",
"new_path": "AndroidStarter/app/src/main/res/layout/activity_main.xml",
"diff": "android:layout_marginTop=\"10dp\"\nandroid:visibility=\"visible\"\nandroid:text=\"Inbox\" />\n+ <Button\n+ android:id=\"@+id/web\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_width=\"wrap_content\"\n+ android:layout_marginTop=\"10dp\"\n+ android:visibility=\"visible\"\n+ android:text=\"WebView\" />\n</LinearLayout>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "AndroidStarter/app/src/main/res/layout/webview.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:orientation=\"vertical\" android:layout_width=\"match_parent\"\n+ android:layout_height=\"match_parent\">\n+ <WebView\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"match_parent\"\n+ android:id=\"@+id/webview\"/>\n+</LinearLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk-3.4.3.aar",
"new_path": "clevertap-android-sdk-3.4.3.aar",
"diff": "Binary files a/clevertap-android-sdk-3.4.3.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "clevertap-android-sdk-3.5.0.aar",
"new_path": "clevertap-android-sdk-3.5.0.aar",
"diff": "Binary files /dev/null and b/clevertap-android-sdk-3.5.0.aar differ\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Preparing for release v3.5.0 |
116,614 | 21.05.2019 17:18:13 | 25,200 | 4d75e8dd3e4255d690dee9e27a685e018fd7f2d5 | remove local notification viewed flag and some cleanup | [
{
"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": "@@ -125,8 +125,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate static final Boolean pendingValidationResultsLock = true;\nprivate static CleverTapInstanceConfig defaultConfig;\nprivate static HashMap<String, CleverTapAPI> instances;\n- static HashMap<String,ArrayList> instanceValidationResults;\n- static ArrayList<ValidationResult> validationResultArrayList = new ArrayList<>();\n+ private static HashMap<String,ArrayList> instanceValidationResults; // TODO Darshan\n+ private static ArrayList<ValidationResult> validationResultArrayList = new ArrayList<>(); // TODO Darshan\nprivate static boolean appForeground = false;\nprivate static int activityCount = 0;\nprivate String currentScreenName = \"\";\n@@ -1586,7 +1586,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nevent.put(Constants.ERROR_KEY, getErrorObject(vr));\n}\ngetConfigLogger().verbose(getAccountId(),\"Pushing Notification Viewed event onto DB\");\n- queuePushNotificationViewedEventToDB(context,event, Constants.RAISED_EVENT);\n+ queuePushNotificationViewedEventToDB(context, event);\ngetConfigLogger().verbose(getAccountId(),\"Pushing Notification Viewed event onto queue flush\");\nschedulePushNotificationViewedQueueFlush(context);\n}catch (Throwable t){\n@@ -1644,7 +1644,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* Record a Screen View event\n* @param screenName String, the name of the screen\n*/\n- @SuppressWarnings({\"unused\", \"WeakerAccess\"})\n+ @SuppressWarnings({\"unused\"})\npublic void recordScreen(String screenName){\nif(screenName == null || (!currentScreenName.isEmpty() && currentScreenName.equals(screenName))) return;\ngetConfigLogger().debug(getAccountId(), \"Screen changed to \" + screenName);\n@@ -1709,7 +1709,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nqueueEventInternal(context,event,table);\n}\n- private void queuePushNotificationViewedEventToDB(final Context context, final JSONObject event, final int eventType){\n+ private void queuePushNotificationViewedEventToDB(final Context context, final JSONObject event){\nqueueEventInternal(context,event,DBAdapter.Table.PUSH_NOTIFICATION_VIEWED);\n}\n@@ -4600,6 +4600,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn;\n}\n+ getConfigLogger().debug(\"Recording Notification Viewed event for notification: \" + extras.toString());\n+\nJSONObject event = new JSONObject();\ntry {\nJSONObject notif = getWzrkFields(extras);\n@@ -5485,6 +5487,24 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nprivate void triggerNotification(Context context, Bundle extras, String notifMessage, String notifTitle, int notificationId) {\n+ NotificationManager notificationManager =\n+ (NotificationManager) context.getSystemService(NOTIFICATION_SERVICE);\n+\n+ if (notificationManager == null) {\n+ String notificationManagerError = \"Unable to render notification, Notification Manager is null.\";\n+ getConfigLogger().debug(getAccountId(), notificationManagerError);\n+ return;\n+ }\n+\n+ String channelId = extras.getString(Constants.WZRK_CHANNEL_ID, \"\");\n+ boolean requiresChannelId = context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.O;\n+ if (requiresChannelId && channelId.isEmpty()) {\n+ String channelIdError = \"Unable to render notification, channelId is required but is not provided in the notification payload: \" + extras.toString();\n+ getConfigLogger().debug(getAccountId(), channelIdError);\n+ pushValidationResult(new ValidationResult(512, channelIdError));\n+ return;\n+ }\n+\nString icoPath = extras.getString(Constants.NOTIF_ICON);\nIntent launchIntent = new Intent(context, CTPushNotificationReceiver.class);\n@@ -5503,7 +5523,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ntry {\nBitmap bpMap = Utils.getNotificationBitmap(bigPictureUrl, false, context);\n- //noinspection ConstantConditions\nif (bpMap == null)\nthrow new Exception(\"Failed to fetch big picture!\");\n@@ -5548,7 +5567,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n- // if we have not user set notificationID then try collapse key\n+ // if we have no user set notificationID then try collapse key\nif (notificationId == Constants.EMPTY_NOTIFICATION_ID) {\ntry {\nObject collapse_key = extras.get(Constants.WZRK_COLLAPSE);\n@@ -5579,12 +5598,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nNotificationCompat.Builder nb;\n-\n- if (context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.O){\n- String channelId = extras.getString(Constants.WZRK_CHANNEL_ID, \"\");\n- if (channelId.isEmpty()) {\n- getConfigLogger().debug(getAccountId(), \"ChannelId is empty for notification: \" + extras.toString());\n- }\n+ if (requiresChannelId) {\nnb = new NotificationCompat.Builder(context, channelId);\n// choices here are Notification.BADGE_ICON_NONE = 0, Notification.BADGE_ICON_SMALL = 1, Notification.BADGE_ICON_LARGE = 2. Default is Notification.BADGE_ICON_LARGE\n@@ -5746,39 +5760,24 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nNotification n = nb.build();\n-\n- getConfigLogger().debug(getAccountId(), \"Building notification: \" + n.toString() + \", with notificationId: \" + String.valueOf(notificationId));\n-\n- NotificationManager notificationManager =\n- (NotificationManager) context.getSystemService(NOTIFICATION_SERVICE);\n-\n- if (notificationManager != null) {\nnotificationManager.notify(notificationId, n);\n+ getConfigLogger().debug(getAccountId(), \"Rendered notification: \" + n.toString());\n+\nString ttl = extras.getString(Constants.WZRK_TIME_TO_LIVE,(System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL)/1000+\"\");\nlong wzrk_ttl = Long.parseLong(ttl);\nString wzrk_pid = extras.getString(Constants.WZRK_PUSH_ID);\nDBAdapter dbAdapter = loadDBAdapter(context);\ngetConfigLogger().verbose(\"Storing Push Notification...\"+wzrk_pid + \" - with ttl - \"+ttl);\ndbAdapter.storePushNotificationId(wzrk_pid,wzrk_ttl);\n- String wzrk_rnv = extras.getString(Constants.WZRK_RNV,\"\");\n- String cid = extras.getString(Constants.WZRK_CHANNEL_ID, \"\");\n- if(!wzrk_rnv.isEmpty()){\n- if(getConfig() !=null && getConfig().getRaiseNotificationViewed() && wzrk_rnv.equals(\"true\")){\n- if (context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.O && !cid.isEmpty()){\n- getConfigLogger().verbose(\"Raising Notification Viewed as per NB\");\n- pushNotificationViewedEvent(extras);\n- }else if(context.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.O) {\n- getConfigLogger().verbose(\"Raising Notification Viewed as per NB\");\n- pushNotificationViewedEvent(extras);\n- }else{\n- getConfigLogger().verbose(\"Not raising Notification Viewed\");\n- }\n- }else{\n- getConfigLogger().verbose(\"Not raising Notification Viewed\");\n- }\n- }\n- }\n+ boolean notificationViewedEnabled = \"true\".equals(extras.getString(Constants.WZRK_RNV,\"\"));\n+ if (!notificationViewedEnabled) {\n+ String notificationViewedError = \"Recording of Notification Viewed is disabled in the CleverTap Dashboard for notification payload: \" + extras.toString();\n+ getConfigLogger().debug(notificationViewedError);\n+ pushValidationResult(new ValidationResult(512, notificationViewedError));\n+ return;\n+ }\n+ pushNotificationViewedEvent(extras);\n}\n@SuppressWarnings(\"SameParameterValue\")\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"diff": "@@ -23,7 +23,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nprivate boolean createdPostAppLaunch;\nprivate boolean sslPinning;\nprivate boolean backgroundSync;\n- private boolean raiseNotificationViewed;\nprivate boolean enableCustomCleverTapId;\nprivate String fcmSenderId;\n@@ -44,7 +43,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.gcmSenderId = manifest.getGCMSenderId();\nthis.sslPinning = manifest.isSSLPinningEnabled();\nthis.backgroundSync = manifest.isBackgroundSync();\n- this.raiseNotificationViewed = manifest.raiseNotificationViewed();\nthis.fcmSenderId = manifest.getFCMSenderId();\nthis.enableCustomCleverTapId = manifest.useCustomId();\n}\n@@ -64,7 +62,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.createdPostAppLaunch = config.createdPostAppLaunch;\nthis.sslPinning = config.sslPinning;\nthis.backgroundSync = config.backgroundSync;\n- this.raiseNotificationViewed = config.raiseNotificationViewed;\nthis.enableCustomCleverTapId = config.enableCustomCleverTapId;\nthis.fcmSenderId = config.fcmSenderId;\n}\n@@ -100,8 +97,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.sslPinning = configJsonObject.getBoolean(Constants.KEY_SSL_PINNING);\nif(configJsonObject.has(Constants.KEY_BACKGROUND_SYNC))\nthis.backgroundSync = configJsonObject.getBoolean(Constants.KEY_BACKGROUND_SYNC);\n- if(configJsonObject.has(Constants.KEY_RAISE_NOTIFICATION_VIEWED))\n- this.raiseNotificationViewed = configJsonObject.getBoolean(Constants.KEY_RAISE_NOTIFICATION_VIEWED);\nif(configJsonObject.has(Constants.KEY_ENABLE_CUSTOM_CT_ID))\nthis.enableCustomCleverTapId = configJsonObject.getBoolean(Constants.KEY_ENABLE_CUSTOM_CT_ID);\nif(configJsonObject.has(Constants.KEY_FCM_SENDER_ID))\n@@ -126,7 +121,6 @@ public class CleverTapInstanceConfig implements Parcelable {\ncreatedPostAppLaunch = in.readByte() != 0x00;\nsslPinning = in.readByte() != 0x00;\nbackgroundSync = in.readByte() != 0x00;\n- raiseNotificationViewed = in.readByte() != 0x00;\nenableCustomCleverTapId = in.readByte() != 0x00;\nfcmSenderId = in.readString();\n}\n@@ -220,6 +214,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nreturn disableAppLaunchedEvent;\n}\n+ @SuppressWarnings({\"unused\"})\npublic void setDisableAppLaunchedEvent(boolean disableAppLaunchedEvent) {\nthis.disableAppLaunchedEvent = disableAppLaunchedEvent;\n}\n@@ -242,12 +237,12 @@ public class CleverTapInstanceConfig implements Parcelable {\nreturn debugLevel;\n}\n- @SuppressWarnings({\"unused\", \"WeakerAccess\"})\n+ @SuppressWarnings({\"unused\"})\npublic void setDebugLevel(CleverTapAPI.LogLevel debugLevel) {\nthis.debugLevel = debugLevel.intValue();\n}\n- @SuppressWarnings({\"unused\", \"WeakerAccess\"})\n+ @SuppressWarnings({\"unused\"})\npublic void setDebugLevel(int debugLevel) {\nthis.debugLevel = debugLevel;\n}\n@@ -260,27 +255,21 @@ public class CleverTapInstanceConfig implements Parcelable {\nreturn backgroundSync;\n}\n- @SuppressWarnings({\"unused\", \"WeakerAccess\"})\n+ @SuppressWarnings({\"unused\"})\npublic void setBackgroundSync(boolean backgroundSync) {\nthis.backgroundSync = backgroundSync;\n}\n- public void setRaiseNotificationViewed(boolean raiseNotificationViewed) {\n- this.raiseNotificationViewed = raiseNotificationViewed;\n- }\n-\n- boolean getRaiseNotificationViewed() {\n- return raiseNotificationViewed;\n- }\n-\nboolean getEnableCustomCleverTapId() {\nreturn enableCustomCleverTapId;\n}\n+ @SuppressWarnings({\"unused\"})\npublic void setEnableCustomCleverTapId(boolean enableCustomCleverTapId) {\nthis.enableCustomCleverTapId = enableCustomCleverTapId;\n}\n+ @SuppressWarnings({\"unused\", \"WeakerAccess\"})\npublic String getFCMSenderId() {\nreturn fcmSenderId;\n}\n@@ -305,7 +294,6 @@ public class CleverTapInstanceConfig implements Parcelable {\ndest.writeByte((byte) (sslPinning ? 0x01 : 0x00));\ndest.writeByte((byte) (createdPostAppLaunch ? 0x01 : 0x00));\ndest.writeByte((byte) (backgroundSync ? 0x01 : 0x00));\n- dest.writeByte((byte) (raiseNotificationViewed ? 0x01 : 0x00));\ndest.writeByte((byte) (enableCustomCleverTapId ? 0x01 : 0x00));\ndest.writeString(fcmSenderId);\n}\n@@ -339,7 +327,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nconfigJsonObject.put(Constants.KEY_CREATED_POST_APP_LAUNCH, isCreatedPostAppLaunch());\nconfigJsonObject.put(Constants.KEY_SSL_PINNING, isSslPinningEnabled());\nconfigJsonObject.put(Constants.KEY_BACKGROUND_SYNC, isBackgroundSync());\n- configJsonObject.put(Constants.KEY_RAISE_NOTIFICATION_VIEWED, getRaiseNotificationViewed());\nconfigJsonObject.put(Constants.KEY_ENABLE_CUSTOM_CT_ID, getEnableCustomCleverTapId());\nconfigJsonObject.put(Constants.KEY_FCM_SENDER_ID, getFCMSenderId());\nreturn configJsonObject.toString();\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": "@@ -152,7 +152,6 @@ public class Constants {\nstatic final String KEY_URL = \"url\";\nstatic final String KEY_BUTTONS = \"buttons\";\nstatic final String KEY_CUSTOM_HTML = \"custom-html\";\n- static final String KEY_RAISE_NOTIFICATION_VIEWED = \"getRaiseNotificationViewed\";\nstatic final String KEY_ENABLE_CUSTOM_CT_ID = \"getEnableCustomCleverTapId\";\nstatic final String WZRK_PUSH_ID = \"wzrk_pid\";\nstatic final String NOTIF_MSG = \"nm\";\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": "@@ -18,7 +18,6 @@ class ManifestInfo {\nprivate static boolean sslPinning;\nprivate static boolean backgroundSync;\nprivate static boolean useCustomID;\n- private static boolean raiseNotificationViewed;\nprivate static String fcmSenderId;\nprivate static String _getManifestStringValueForKey(Bundle manifest, String name) {\n@@ -59,7 +58,6 @@ class ManifestInfo {\nsslPinning = \"1\".equals(_getManifestStringValueForKey(metaData,Constants.LABEL_SSL_PINNING));\nbackgroundSync = \"1\".equals(_getManifestStringValueForKey(metaData,Constants.LABEL_BACKGROUND_SYNC));\nuseCustomID = \"1\".equals(_getManifestStringValueForKey(metaData,Constants.LABEL_CUSTOM_ID));\n- raiseNotificationViewed = \"1\".equals(_getManifestStringValueForKey(metaData,Constants.LABEL_RAISE_NOTIFICATION_VIEWED));\nfcmSenderId = _getManifestStringValueForKey(metaData, Constants.LABEL_FCM_SENDER_ID);\nif (fcmSenderId != null) {\nfcmSenderId = fcmSenderId.replace(\"id:\", \"\");\n@@ -117,10 +115,6 @@ class ManifestInfo {\nreturn useCustomID;\n}\n- boolean raiseNotificationViewed() {\n- return raiseNotificationViewed;\n- }\n-\nstatic void changeCredentials(String id, String token, String region){\naccountId = id;\naccountToken = token;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | remove local notification viewed flag and some cleanup |
116,623 | 23.05.2019 18:59:23 | -19,080 | afef8ffa6b7ea534909535f2baf42eb065aa11dc | Landscape template UI changes and refactoring recording device errors | [
{
"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": "@@ -28,6 +28,7 @@ public class CTInAppNativeHalfInterstitialFragment extends CTInAppBaseFullNative\nprivate RelativeLayout relativeLayout;\n@SuppressWarnings({\"unused\"})\nprivate int layoutHeight = 0;\n+ private int layoutWidth = 0;\n@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)\n@Nullable\n@Override\n@@ -99,7 +100,8 @@ public class CTInAppNativeHalfInterstitialFragment extends CTInAppBaseFullNative\ncloseLp.setMargins(0, 20, 220, 0);\ncloseImageView.setLayoutParams(closeLp);\n} else {\n- layoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth() * 0.75f);\n+ layoutWidth = layoutParams.width = (int) (relativeLayout1.getMeasuredHeight() * 1.3f);\n+ layoutParams.gravity = Gravity.CENTER_HORIZONTAL;\nrelativeLayout1.setLayoutParams(layoutParams);\n}\n}\n"
},
{
"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": "@@ -20,6 +20,7 @@ public class CTInAppNativeHalfInterstitialImageFragment extends CTInAppBaseFullF\nprivate RelativeLayout relativeLayout;\n@SuppressWarnings({\"unused\"})\nprivate int layoutHeight = 0;\n+ private int layoutWidth = 0;\n@Nullable\n@Override\npublic View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {\n@@ -91,7 +92,8 @@ public class CTInAppNativeHalfInterstitialImageFragment extends CTInAppBaseFullF\ncloseLp.setMargins(0, 20, 220, 0);\ncloseImageView.setLayoutParams(closeLp);\n} else {\n- layoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth() * 0.75f);\n+ layoutWidth = layoutParams.width = (int) (relativeLayout1.getMeasuredHeight() * 1.3f);\n+ layoutParams.gravity = Gravity.CENTER_HORIZONTAL;\nrelativeLayout1.setLayoutParams(layoutParams);\n}\n}\n"
},
{
"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,6 +3,7 @@ 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@@ -58,6 +59,7 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nprivate FrameLayout videoFrameLayout;\n@SuppressWarnings({\"unused\"})\nprivate int layoutHeight = 0;\n+ private int layoutWidth = 0;\n@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)\n@Nullable\n@@ -147,21 +149,21 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nRelativeLayout relativeLayout1 = fl.findViewById(R.id.interstitial_relative_layout);\nFrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout1.getLayoutParams();\nif (inAppNotification.isTablet() && isTablet()) {\n- layoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth() * 1.78f);\n+ //layoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth() * 1.78f);\n+ layoutWidth = layoutParams.width = (int) (relativeLayout1.getMeasuredHeight() * 1.78f);\n} else {\nif (isTablet()) {\nlayoutParams.setMargins(120, 40, 85, 0);\n- layoutParams.width = (relativeLayout1.getMeasuredWidth()) - 75;\n- layoutHeight = layoutParams.height = (int) (layoutParams.width * 0.5625f);\n+ layoutParams.height = (relativeLayout1.getMeasuredHeight()) - 75;\n+ layoutWidth = layoutParams.width = (int)(layoutParams.height * 1.78f);\nrelativeLayout1.setLayoutParams(layoutParams);\nFrameLayout.LayoutParams closeLp = new FrameLayout.LayoutParams(closeImageView.getWidth(), closeImageView.getHeight());\ncloseLp.gravity = Gravity.TOP | Gravity.END;\ncloseLp.setMargins(0, 20, 90, 0);\ncloseImageView.setLayoutParams(closeLp);\n} else {\n- layoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth() * 0.5625f);\n- Logger.d(\"Layout height = \" + layoutHeight);\n- Logger.d(\"Layout width = \" + relativeLayout1.getMeasuredWidth());\n+ layoutWidth = layoutParams.width = (int) (relativeLayout1.getMeasuredHeight() * 1.78f);\n+ layoutParams.gravity = Gravity.CENTER_HORIZONTAL;\nrelativeLayout1.setLayoutParams(layoutParams);\n}\n}\n"
},
{
"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": "@@ -21,6 +21,7 @@ public class CTInAppNativeInterstitialImageFragment extends CTInAppBaseFullFragm\nprivate RelativeLayout relativeLayout;\n@SuppressWarnings({\"unused\"})\nprivate int layoutHeight = 0;\n+ private int layoutWidth = 0;\n@Nullable\n@Override\n@@ -85,15 +86,16 @@ public class CTInAppNativeInterstitialImageFragment extends CTInAppBaseFullFragm\n} else {\nif (isTablet()) {\nlayoutParams.setMargins(120, 40, 85, 0);\n- layoutParams.width = (relativeLayout1.getMeasuredWidth()) - 75;\n- layoutHeight = layoutParams.height = (int) (layoutParams.width * 0.5625f);\n+ layoutParams.height = (relativeLayout.getMeasuredHeight()) - 75;\n+ layoutWidth = layoutParams.width = (int)(layoutParams.height * 1.78f);\nrelativeLayout1.setLayoutParams(layoutParams);\nFrameLayout.LayoutParams closeLp = new FrameLayout.LayoutParams(closeImageView.getWidth(), closeImageView.getHeight());\ncloseLp.gravity = Gravity.TOP | Gravity.END;\ncloseLp.setMargins(0, 20, 90, 0);\ncloseImageView.setLayoutParams(closeLp);\n} else {\n- layoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth() * 0.5625f);\n+ layoutWidth = layoutParams.width = (int) (relativeLayout1.getMeasuredHeight() * 1.78f);\n+ layoutParams.gravity = Gravity.CENTER_HORIZONTAL;\nrelativeLayout1.setLayoutParams(layoutParams);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -125,8 +125,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate static final Boolean pendingValidationResultsLock = true;\nprivate static CleverTapInstanceConfig defaultConfig;\nprivate static HashMap<String, CleverTapAPI> instances;\n- private static HashMap<String,ArrayList> instanceValidationResults; // TODO Darshan\n- private static ArrayList<ValidationResult> validationResultArrayList = new ArrayList<>(); // TODO Darshan\nprivate static boolean appForeground = false;\nprivate static int activityCount = 0;\nprivate String currentScreenName = \"\";\n@@ -142,12 +140,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@SuppressWarnings({\"FieldCanBeLocal\", \"unused\"})\nprivate static String sdkVersion; // For Google Play Store/Android Studio analytics\n- static void addValidationResultForInstanceCreation(String errorDescription){\n- ValidationResult validationResult = new ValidationResult();\n- validationResult.setErrorCode(514);\n- validationResult.setErrorDesc(errorDescription);\n- validationResultArrayList.add(validationResult);\n- }\n/**\n* Method to check whether app has ExoPlayer dependencies\n* @return boolean - true/false depending on app's availability of ExoPlayer dependencies\n@@ -567,9 +559,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (instances == null) {\ninstances = new HashMap<>();\n}\n- if(instanceValidationResults == null){\n- instanceValidationResults = new HashMap<>();\n- }\nCleverTapAPI instance = instances.get(config.getAccountId());\nif (instance == null){\n@@ -577,10 +566,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ninstances.put(config.getAccountId(), instance);\nif(instance.getCleverTapID() != null) {\ninstance.notifyUserProfileInitialized();\n- instanceValidationResults.put(config.getAccountId(),validationResultArrayList);\n- for(ValidationResult vr : validationResultArrayList) {\n- instance.pushValidationResult(vr);\n- }\n+ instance.recordDeviceIDErrors();\n}\n} else if(instance.isErrorDeviceId() && instance.getConfig().getEnableCustomCleverTapId() && Utils.validateCTID(cleverTapID)) {\ninstance.asyncProfileSwitchUser(null,null,cleverTapID);\n@@ -611,6 +597,14 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n+ private void recordDeviceIDErrors(){\n+ if(this.isErrorDeviceId()){\n+ for(ValidationResult validationResult : this.deviceInfo.getValidationResults()){\n+ pushValidationResult(validationResult);\n+ }\n+ }\n+ }\n+\n//Lifecycle\nprivate void activityPaused() {\nsetAppForeground(false);\n@@ -4971,6 +4965,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprocessingUserLoginIdentifier = null;\n}\nresetInbox();\n+ recordDeviceIDErrors();\n} catch (Throwable t) {\ngetConfigLogger().verbose(getAccountId(), \"Reset Profile error\", t);\n}\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": "@@ -25,7 +25,6 @@ class DeviceInfo {\nprivate Context context;\nprivate CleverTapInstanceConfig config;\nprivate static final String GUID_PREFIX = \"__\";\n- //private String provisionalGUID = null;\nprivate final Object deviceIDLock = new Object();\nprivate final Object adIDLock = new Object();\nprivate String googleAdID = null;\n@@ -33,6 +32,11 @@ class DeviceInfo {\nprivate boolean adIdRun = false;\nprivate static final String OS_NAME = \"Android\";\nprivate DeviceCachedInfo cachedInfo;\n+ private ArrayList<ValidationResult> validationResults = new ArrayList<>();\n+\n+ ArrayList<ValidationResult> getValidationResults() {\n+ return validationResults;\n+ }\nDeviceInfo(Context context, CleverTapInstanceConfig config, String cleverTapID) {\nthis.context = context;\n@@ -77,12 +81,12 @@ class DeviceInfo {\nif(config.getEnableCustomCleverTapId()){\nif(cleverTapID == null){\nconfig.getLogger().info(\"CLEVERTAP_USE_CUSTOM_ID has been specified in the AndroidManifest.xml/Instance Configuration. CleverTap SDK will create a fallback device ID\");\n- CleverTapAPI.addValidationResultForInstanceCreation(\"CLEVERTAP_USE_CUSTOM_ID has been specified in the AndroidManifest.xml/Instance Configuration. CleverTap SDK will create a fallback device ID\");\n+ recordDeviceError(\"CLEVERTAP_USE_CUSTOM_ID has been specified in the AndroidManifest.xml/Instance Configuration. CleverTap SDK will create a fallback device ID\");\n}\n}else{\nif(cleverTapID != null){\nconfig.getLogger().info(\"CLEVERTAP_USE_CUSTOM_ID has not been specified in the AndroidManifest.xml. Custom CleverTap ID passed will not be used.\");\n- CleverTapAPI.addValidationResultForInstanceCreation(\"CLEVERTAP_USE_CUSTOM_ID has not been specified in the AndroidManifest.xml. Custom CleverTap ID passed will not be used.\");\n+ recordDeviceError(\"CLEVERTAP_USE_CUSTOM_ID has not been specified in the AndroidManifest.xml. Custom CleverTap ID passed will not be used.\");\n}\n}\n@@ -91,7 +95,7 @@ class DeviceInfo {\ngetConfigLogger().verbose(config.getAccountId(),\"CleverTap ID already present for profile\");\nif(cleverTapID != null) {\ngetConfigLogger().info(config.getAccountId(),\"CleverTap ID - \"+deviceID+\" already exists. Unable to set custom CleverTap ID - \" + cleverTapID);\n- CleverTapAPI.addValidationResultForInstanceCreation(\"CleverTap ID - \"+deviceID+\" already exists. Unable to set custom CleverTap ID - \" + cleverTapID);\n+ recordDeviceError(\"CleverTap ID - \"+deviceID+\" already exists. Unable to set custom CleverTap ID - \" + cleverTapID);\n}\nreturn;\n}\n@@ -127,10 +131,16 @@ class DeviceInfo {\nsetOrGenerateFallbackDeviceID();\nremoveDeviceID();\ngetConfigLogger().info(config.getAccountId(),\"Attempted to set invalid custom CleverTap ID - \"+cleverTapID+\", falling back to default error CleverTap ID - \"+getFallBackDeviceID());\n- CleverTapAPI.addValidationResultForInstanceCreation(\"Attempted to set invalid custom CleverTap ID - \"+cleverTapID+\", falling back to default error CleverTap ID - \"+getFallBackDeviceID());\n}\n}\n+ private void recordDeviceError(String errorDescription){\n+ ValidationResult validationResult = new ValidationResult();\n+ validationResult.setErrorCode(514);\n+ validationResult.setErrorDesc(errorDescription);\n+ validationResults.add(validationResult);\n+ }\n+\nboolean isErrorDeviceId(){\nreturn getDeviceID() != null && getDeviceID().startsWith(Constants.ERROR_PROFILE_PREFIX);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -9,6 +9,7 @@ import android.content.res.Configuration;\nimport android.net.Uri;\nimport android.os.Bundle;\nimport android.support.v4.app.FragmentActivity;\n+import android.view.WindowManager;\nimport java.lang.ref.WeakReference;\n@@ -53,6 +54,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\npublic void onCreate(Bundle savedInstanceState) {\nsuper.onCreate(savedInstanceState);\n+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);\ntry {\nBundle notif = getIntent().getExtras();\nif (notif == null) throw new IllegalArgumentException();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-land/inapp_cover.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inapp_cover.xml",
"diff": "<TextView\nandroid:id=\"@+id/cover_title\"\n- android:layout_width=\"262dp\"\n+ android:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:gravity=\"center\"\n- android:maxLines=\"2\"\n+ android:maxLines=\"1\"\nandroid:textSize=\"30sp\"\nandroid:textStyle=\"bold\"\nandroid:textColor=\"@android:color/black\"\n- android:layout_marginTop=\"54dp\"\n+ android:layout_marginTop=\"24dp\"\nandroid:layout_centerHorizontal=\"true\"\n/>\n<TextView\nandroid:id=\"@+id/cover_message\"\n- android:layout_width=\"262dp\"\n+ android:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:gravity=\"center\"\n- android:textSize=\"18sp\"\n+ android:maxLines=\"2\"\n+ android:textSize=\"22sp\"\nandroid:layout_below=\"@+id/cover_title\"\n- android:layout_marginTop=\"40dp\"\n+ android:layout_marginTop=\"74dp\"\nandroid:textColor=\"@android:color/black\"\nandroid:layout_centerHorizontal=\"true\"\n+ android:layout_marginStart=\"50dp\"\n+ android:layout_marginLeft=\"50dp\"\n+ android:layout_marginRight=\"50dp\"\n+ android:layout_marginEnd=\"50dp\"\n/>\n<LinearLayout\nandroid:id=\"@+id/cover_linear_layout\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\n- android:gravity=\"bottom\"\n- android:orientation=\"horizontal\"\n- android:visibility=\"visible\"\nandroid:layout_below=\"@+id/cover_message\"\n- android:layout_marginTop=\"15dp\"\n- android:layout_alignParentBottom=\"true\"\nandroid:layout_centerHorizontal=\"true\"\n- android:layout_marginBottom=\"48dp\"\n- >\n+ android:layout_marginTop=\"102dp\"\n+ android:gravity=\"center\"\n+ android:orientation=\"horizontal\"\n+ android:visibility=\"visible\">\n<Button\nandroid:id=\"@+id/cover_button1\"\n- android:layout_width=\"264dp\"\n- android:layout_height=\"42dp\"\n+ android:layout_width=\"220dp\"\n+ android:layout_height=\"46dp\"\nandroid:textSize=\"20sp\"\n- android:visibility=\"invisible\" />\n+ android:visibility=\"gone\" />\n<Button\nandroid:id=\"@+id/cover_button2\"\n- android:layout_width=\"264dp\"\n- android:layout_height=\"42dp\"\n+ android:layout_width=\"220dp\"\n+ android:layout_height=\"46dp\"\n+ android:layout_marginStart=\"22dp\"\n+ android:layout_marginLeft=\"22dp\"\nandroid:textSize=\"20sp\"\n- android:layout_marginLeft=\"24dp\"\n- android:visibility=\"invisible\"\n- android:layout_marginStart=\"24dp\" />\n+ android:visibility=\"gone\" />\n</LinearLayout>\n</RelativeLayout>\n<com.clevertap.android.sdk.CloseImageView\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:id=\"@+id/half_interstitial_relative_layout\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n- android:layout_marginLeft=\"130dp\"\n- android:layout_marginStart=\"130dp\"\n- android:layout_marginRight=\"130dp\"\n- android:layout_marginEnd=\"130dp\"\n- android:layout_marginTop=\"20dp\"\n- android:layout_marginBottom=\"20dp\"\n+ android:layout_marginLeft=\"124dp\"\n+ android:layout_marginStart=\"124dp\"\n+ android:layout_marginRight=\"124dp\"\n+ android:layout_marginEnd=\"124dp\"\n+ android:layout_marginTop=\"33dp\"\n+ android:layout_marginBottom=\"33dp\"\n>\n<ImageView\n<TextView\nandroid:id=\"@+id/half_interstitial_title\"\n- android:layout_width=\"256dp\"\n+ android:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_centerHorizontal=\"true\"\n- android:layout_marginTop=\"24dp\"\n+ android:layout_marginTop=\"23dp\"\nandroid:gravity=\"center\"\n- android:textSize=\"21sp\"\n+ android:maxLines=\"1\"\n+ android:textSize=\"24sp\"\nandroid:textStyle=\"bold\"\n+ android:text=\"Lorem ipsum dolor sit amet.\"\nandroid:textColor=\"@android:color/black\"/>\n<TextView\nandroid:id=\"@+id/half_interstitial_message\"\n- android:layout_width=\"256dp\"\n+ android:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_centerHorizontal=\"true\"\nandroid:layout_below=\"@+id/half_interstitial_title\"\n- android:layout_marginTop=\"20dp\"\n+ android:layout_marginTop=\"16dp\"\n+ android:layout_marginLeft=\"40dp\"\n+ android:layout_marginStart=\"40dp\"\n+ android:layout_marginEnd=\"40dp\"\n+ android:layout_marginRight=\"40dp\"\nandroid:gravity=\"center\"\n- android:textSize=\"16sp\"/>\n+ android:maxLines=\"3\"\n+ android:textColor=\"@android:color/black\"\n+ android:text=\"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce ac pharetra ligula. Sed commodo amet.\"\n+ android:textSize=\"18sp\"/>\n<LinearLayout\nandroid:id=\"@+id/half_interstitial_linear_layout\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\n- android:layout_alignParentBottom=\"true\"\nandroid:layout_centerHorizontal=\"true\"\n- android:layout_marginBottom=\"12dp\"\nandroid:layout_below=\"@+id/half_interstitial_message\"\n- android:gravity=\"bottom\"\n+ android:gravity=\"center\"\n+ android:layout_marginTop=\"96dp\"\nandroid:orientation=\"horizontal\"\nandroid:visibility=\"visible\">\n<Button\nandroid:id=\"@+id/half_interstitial_button1\"\n- android:layout_width=\"224dp\"\n+ android:layout_width=\"160dp\"\nandroid:layout_height=\"40dp\"\nandroid:textSize=\"16sp\"\n- android:visibility=\"invisible\"/>\n+ android:visibility=\"visible\"/>\n<Button\nandroid:id=\"@+id/half_interstitial_button2\"\n- android:layout_width=\"224dp\"\n+ android:layout_width=\"160dp\"\nandroid:layout_height=\"40dp\"\nandroid:textSize=\"16sp\"\n- android:layout_marginLeft=\"10dp\"\n- android:visibility=\"invisible\"\n+ android:layout_marginLeft=\"20dp\"\n+ android:visibility=\"visible\"\nandroid:layout_marginStart=\"10dp\" />\n</LinearLayout>\n</RelativeLayout>\nandroid:layout_width=\"30dp\"\nandroid:layout_height=\"30dp\"\nandroid:layout_gravity=\"top|end\"\n- android:layout_marginRight=\"115dp\"\n- android:layout_marginTop=\"15dp\"\n+ android:layout_marginRight=\"132dp\"\n+ android:layout_marginTop=\"24dp\"\nandroid:adjustViewBounds=\"true\"\n- android:layout_marginEnd=\"115dp\"/>\n+ android:layout_marginEnd=\"132dp\"/>\n</FrameLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-land/inapp_half_interstitial_image.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inapp_half_interstitial_image.xml",
"diff": "android:layout_width=\"30dp\"\nandroid:layout_height=\"30dp\"\nandroid:layout_gravity=\"top|end\"\n- android:layout_marginRight=\"115dp\"\n+ android:layout_marginRight=\"137dp\"\nandroid:layout_marginTop=\"15dp\"\nandroid:adjustViewBounds=\"true\"\n- android:layout_marginEnd=\"115dp\"/>\n+ android:layout_marginEnd=\"137dp\"/>\n</FrameLayout>\n\\ No newline at end of file\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": "android:id=\"@+id/interstitial_relative_layout\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n- android:layout_marginTop=\"45dp\"\n+ android:layout_marginTop=\"35dp\"\nandroid:layout_marginLeft=\"80dp\"\nandroid:layout_marginRight=\"80dp\"\n- android:layout_marginBottom=\"45dp\"\n+ android:layout_marginBottom=\"35dp\"\n>\n<TextView\nandroid:id=\"@+id/interstitial_title\"\n- android:layout_width=\"240dp\"\n+ android:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_centerHorizontal=\"true\"\nandroid:gravity=\"center\"\nandroid:textStyle=\"bold\"\nandroid:textColor=\"@android:color/black\"\n- android:textSize=\"22sp\"\n- android:layout_marginTop=\"12dp\"\n- android:maxLines=\"1\" />\n+ android:textSize=\"21sp\"\n+ android:layout_marginTop=\"10dp\"\n+ android:maxLines=\"1\"\n+ android:text=\"Nam efficitur tortor metus.\"/>\n<ImageView\nandroid:id=\"@+id/backgroundImage\"\n- android:layout_width=\"240dp\"\n- android:layout_height=\"134dp\"\n+ android:layout_width=\"214dp\"\n+ android:layout_height=\"120dp\"\nandroid:layout_centerHorizontal=\"true\"\n- android:layout_marginTop=\"12dp\"\n+ android:layout_marginTop=\"7dp\"\nandroid:scaleType=\"centerCrop\"\nandroid:layout_below=\"@+id/interstitial_title\"\nandroid:visibility=\"invisible\"/>\n<com.clevertap.android.sdk.GifImageView\nandroid:id=\"@+id/gifImage\"\n- android:layout_width=\"240dp\"\n- android:layout_height=\"134dp\"\n+ android:layout_width=\"214dp\"\n+ android:layout_height=\"120dp\"\nandroid:layout_centerHorizontal=\"true\"\n- android:layout_marginTop=\"12dp\"\n+ android:layout_marginTop=\"7dp\"\nandroid:scaleType=\"centerCrop\"\nandroid:layout_below=\"@+id/interstitial_title\"\nandroid:visibility=\"gone\"/>\n<FrameLayout\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\n- android:layout_marginTop=\"12dp\"\n+ android:layout_marginTop=\"7dp\"\nandroid:visibility=\"gone\"\nandroid:id=\"@+id/video_frame\"\nandroid:layout_below=\"@id/interstitial_title\"\n<TextView\nandroid:id=\"@+id/interstitial_message\"\n- android:layout_width=\"440dp\"\n+ android:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_centerHorizontal=\"true\"\n- android:layout_marginTop=\"12dp\"\n+ android:layout_marginTop=\"10dp\"\nandroid:layout_below=\"@+id/backgroundImage\"\nandroid:gravity=\"center\"\n- android:textSize=\"18sp\"\n- android:maxLines=\"3\"\n+ android:textSize=\"17sp\"\n+ android:maxLines=\"2\"\n+ android:layout_marginLeft=\"35dp\"\n+ android:layout_marginStart=\"35dp\"\n+ android:layout_marginRight=\"35dp\"\n+ android:layout_marginEnd=\"35dp\"\n+ android:text=\"Etiam ullamcorper sapien pellentesque commodo faucibus. Nam eget nulla sed.\"\nandroid:textColor=\"@android:color/black\" />\n<LinearLayout\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_below=\"@id/interstitial_message\"\n- android:layout_alignParentBottom=\"true\"\nandroid:layout_centerHorizontal=\"true\"\nandroid:orientation=\"horizontal\"\n- android:gravity=\"bottom\"\n- android:layout_marginBottom=\"8dp\"\n+ android:layout_marginTop=\"12dp\"\nandroid:visibility=\"visible\">\n<Button\nandroid:id=\"@+id/interstitial_button1\"\n- android:layout_width=\"208dp\"\n- android:layout_height=\"42dp\"\n+ android:layout_width=\"206dp\"\n+ android:layout_height=\"40dp\"\nandroid:textSize=\"16sp\"\n- android:visibility=\"gone\" />\n+ android:visibility=\"visible\" />\n<Button\nandroid:id=\"@+id/interstitial_button2\"\n- android:layout_width=\"208dp\"\n- android:layout_height=\"42dp\"\n+ android:layout_width=\"206dp\"\n+ android:layout_height=\"40dp\"\nandroid:textSize=\"16sp\"\n- android:layout_marginLeft=\"10dp\"\n- android:visibility=\"gone\"\n+ android:layout_marginLeft=\"18dp\"\n+ android:visibility=\"visible\"\nandroid:layout_marginStart=\"10dp\" />\n</LinearLayout>\n</RelativeLayout>\nandroid:layout_width=\"30dp\"\nandroid:layout_height=\"30dp\"\nandroid:layout_gravity=\"top|end\"\n- android:layout_marginRight=\"65dp\"\n+ android:layout_marginRight=\"45dp\"\nandroid:layout_marginTop=\"30dp\"\nandroid:adjustViewBounds=\"true\"\n- android:layout_marginEnd=\"65dp\" />\n+ android:layout_marginEnd=\"45dp\" />\n</FrameLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-land/inapp_interstitial_image.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inapp_interstitial_image.xml",
"diff": "android:id=\"@+id/interstitial_image_relative_layout\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n- android:layout_marginTop=\"45dp\"\n+ android:layout_marginTop=\"35dp\"\nandroid:layout_marginLeft=\"80dp\"\nandroid:layout_marginRight=\"80dp\"\n- android:layout_marginBottom=\"45dp\"\n+ android:layout_marginBottom=\"35dp\"\n>\n<ImageView\nandroid:layout_width=\"30dp\"\nandroid:layout_height=\"30dp\"\nandroid:layout_gravity=\"top|end\"\n- android:layout_marginRight=\"65dp\"\n+ android:layout_marginRight=\"75dp\"\nandroid:layout_marginTop=\"30dp\"\nandroid:adjustViewBounds=\"true\"\nandroid:layout_marginEnd=\"65dp\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-sw600dp-land/inapp_cover.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-sw600dp-land/inapp_cover.xml",
"diff": "android:textSize=\"30sp\"\nandroid:textStyle=\"bold\"\nandroid:textColor=\"@android:color/black\"\n- android:layout_marginTop=\"54dp\"\n+ android:layout_marginTop=\"60dp\"\nandroid:layout_centerHorizontal=\"true\"\n/>\n<TextView\nandroid:id=\"@+id/cover_message\"\n- android:layout_width=\"262dp\"\n+ android:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:gravity=\"center\"\nandroid:textSize=\"18sp\"\nandroid:layout_marginTop=\"40dp\"\nandroid:textColor=\"@android:color/black\"\nandroid:layout_centerHorizontal=\"true\"\n- />\n+ android:layout_marginStart=\"74dp\"\n+ android:layout_marginLeft=\"74dp\"\n+ android:layout_marginRight=\"74dp\"\n+ android:layout_marginEnd=\"74dp\"/>\n<LinearLayout\nandroid:id=\"@+id/cover_linear_layout\"\nandroid:orientation=\"horizontal\"\nandroid:visibility=\"visible\"\nandroid:layout_below=\"@+id/cover_message\"\n- android:layout_alignParentBottom=\"true\"\nandroid:layout_centerHorizontal=\"true\"\n- android:layout_marginBottom=\"48dp\"\n+ android:layout_marginBottom=\"60dp\"\n+ android:layout_marginTop=\"250dp\"\n>\n<Button\nandroid:id=\"@+id/cover_button1\"\n- android:layout_width=\"264dp\"\n- android:layout_height=\"42dp\"\n+ android:layout_width=\"340dp\"\n+ android:layout_height=\"70dp\"\nandroid:textSize=\"20sp\"\n- android:visibility=\"invisible\" />\n+ android:visibility=\"gone\" />\n<Button\nandroid:id=\"@+id/cover_button2\"\n- android:layout_width=\"264dp\"\n- android:layout_height=\"42dp\"\n+ android:layout_width=\"340dp\"\n+ android:layout_height=\"70dp\"\nandroid:textSize=\"20sp\"\nandroid:layout_marginLeft=\"30dp\"\n- android:visibility=\"invisible\"\n+ android:visibility=\"gone\"\nandroid:layout_marginStart=\"30dp\" />\n</LinearLayout>\n</RelativeLayout>\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-sw600dp-land/tab_inapp_half_interstitial.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-sw600dp-land/tab_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_marginLeft=\"180dp\"\n- android:layout_marginStart=\"180dp\"\n- android:layout_marginRight=\"180dp\"\n- android:layout_marginEnd=\"180dp\"\n- android:layout_marginTop=\"40dp\"\n- android:layout_marginBottom=\"40dp\"\n+ android:layout_marginLeft=\"240dp\"\n+ android:layout_marginStart=\"240dp\"\n+ android:layout_marginRight=\"240dp\"\n+ android:layout_marginEnd=\"240dp\"\n+ android:layout_marginTop=\"60dp\"\n+ android:layout_marginBottom=\"60dp\"\n>\n<ImageView\n<TextView\nandroid:id=\"@+id/half_interstitial_title\"\n- android:layout_width=\"256dp\"\n+ android:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_centerHorizontal=\"true\"\n- android:layout_marginTop=\"34dp\"\n+ android:layout_marginTop=\"50dp\"\nandroid:gravity=\"center\"\nandroid:textSize=\"21sp\"\n+ android:maxLines=\"1\"\nandroid:textStyle=\"bold\"\nandroid:textColor=\"@android:color/black\"/>\n<TextView\nandroid:id=\"@+id/half_interstitial_message\"\n- android:layout_width=\"256dp\"\n+ android:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_centerHorizontal=\"true\"\nandroid:layout_below=\"@+id/half_interstitial_title\"\nandroid:layout_marginTop=\"30dp\"\n+ android:maxLines=\"3\"\nandroid:gravity=\"center\"\nandroid:textSize=\"16sp\"/>\nandroid:id=\"@+id/half_interstitial_linear_layout\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\n- android:layout_alignParentBottom=\"true\"\nandroid:layout_centerHorizontal=\"true\"\nandroid:layout_marginBottom=\"26dp\"\n+ android:layout_marginTop=\"198dp\"\nandroid:layout_below=\"@+id/half_interstitial_message\"\n- android:gravity=\"bottom\"\n- android:orientation=\"vertical\"\n+ android:gravity=\"center\"\n+ android:orientation=\"horizontal\"\nandroid:visibility=\"visible\">\n<Button\nandroid:id=\"@+id/half_interstitial_button1\"\n- android:layout_width=\"324dp\"\n- android:layout_height=\"40dp\"\n+ android:layout_width=\"200dp\"\n+ android:layout_height=\"70dp\"\nandroid:textSize=\"16sp\"\n- android:visibility=\"invisible\" />\n+ android:visibility=\"visible\" />\n<Button\nandroid:id=\"@+id/half_interstitial_button2\"\n- android:layout_width=\"324dp\"\n- android:layout_height=\"40dp\"\n+ android:layout_width=\"200dp\"\n+ android:layout_height=\"70dp\"\nandroid:textSize=\"16sp\"\n- android:layout_marginTop=\"12dp\"\n- android:visibility=\"invisible\" />\n+ android:layout_marginLeft=\"25dp\"\n+ android:visibility=\"visible\"\n+ android:layout_marginStart=\"12dp\" />\n</LinearLayout>\n</RelativeLayout>\n<com.clevertap.android.sdk.CloseImageView\nandroid:layout_width=\"40dp\"\nandroid:layout_height=\"40dp\"\nandroid:layout_gravity=\"top|end\"\n- android:layout_marginRight=\"160dp\"\n- android:layout_marginTop=\"20dp\"\n+ android:layout_marginRight=\"220dp\"\n+ android:layout_marginTop=\"40dp\"\nandroid:adjustViewBounds=\"true\"\nandroid:layout_marginEnd=\"40dp\" />\n</FrameLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-sw600dp-land/tab_inapp_interstitial.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-sw600dp-land/tab_inapp_interstitial.xml",
"diff": "<TextView\nandroid:id=\"@+id/interstitial_title\"\n- android:layout_width=\"240dp\"\n+ android:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_centerHorizontal=\"true\"\n- android:layout_marginTop=\"36dp\"\n+ android:layout_marginTop=\"30dp\"\nandroid:gravity=\"center\"\nandroid:textStyle=\"bold\"\nandroid:textColor=\"@android:color/black\"\n<ImageView\nandroid:id=\"@+id/backgroundImage\"\n- android:layout_width=\"240dp\"\n- android:layout_height=\"134dp\"\n+ android:layout_width=\"314dp\"\n+ android:layout_height=\"176dp\"\nandroid:layout_centerHorizontal=\"true\"\n- android:layout_marginTop=\"6dp\"\n+ android:layout_marginTop=\"20dp\"\nandroid:scaleType=\"centerCrop\"\nandroid:layout_below=\"@+id/interstitial_title\"\nandroid:visibility=\"invisible\"/>\n<com.clevertap.android.sdk.GifImageView\nandroid:id=\"@+id/gifImage\"\n- android:layout_width=\"240dp\"\n- android:layout_height=\"134dp\"\n+ android:layout_width=\"314dp\"\n+ android:layout_height=\"176dp\"\nandroid:layout_centerHorizontal=\"true\"\n- android:layout_marginTop=\"6dp\"\n+ android:layout_marginTop=\"20dp\"\nandroid:scaleType=\"centerCrop\"\nandroid:layout_below=\"@+id/interstitial_title\"\nandroid:visibility=\"gone\"/>\n<TextView\nandroid:id=\"@+id/interstitial_message\"\n- android:layout_width=\"240dp\"\n+ android:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_centerHorizontal=\"true\"\nandroid:layout_marginTop=\"24dp\"\nandroid:textSize=\"18sp\"\nandroid:maxLines=\"3\"\nandroid:textColor=\"@android:color/black\"\n+ android:layout_marginLeft=\"34dp\"\n+ android:layout_marginStart=\"34dp\"\n+ android:layout_marginRight=\"34dp\"\n+ android:layout_marginEnd=\"34dp\"\n/>\n<LinearLayout\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_below=\"@id/interstitial_message\"\n- android:layout_alignParentBottom=\"true\"\nandroid:layout_centerHorizontal=\"true\"\nandroid:orientation=\"horizontal\"\nandroid:gravity=\"center\"\n- android:visibility=\"visible\">\n+ android:visibility=\"visible\"\n+ android:layout_marginTop=\"24dp\">\n<Button\nandroid:id=\"@+id/interstitial_button1\"\n- android:layout_width=\"208dp\"\n- android:layout_height=\"42dp\"\n+ android:layout_width=\"340dp\"\n+ android:layout_height=\"70dp\"\nandroid:textSize=\"16sp\"\n- android:visibility=\"gone\" />\n+ android:visibility=\"visible\" />\n<Button\nandroid:id=\"@+id/interstitial_button2\"\n- android:layout_width=\"208dp\"\n- android:layout_height=\"42dp\"\n+ android:layout_width=\"340dp\"\n+ android:layout_height=\"70dp\"\nandroid:textSize=\"16sp\"\n- android:layout_marginLeft=\"5dp\"\n- android:visibility=\"gone\"\n- android:layout_marginStart=\"5dp\" />\n+ android:layout_marginLeft=\"25dp\"\n+ android:visibility=\"visible\"\n+ android:layout_marginStart=\"25dp\" />\n</LinearLayout>\n</RelativeLayout>\n<com.clevertap.android.sdk.CloseImageView\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Landscape template UI changes and refactoring recording device errors |
116,614 | 24.05.2019 07:39:59 | 25,200 | b4fce58bd761f807c5dd03a2b5e85b1bdb310756 | add more specific channelId error 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": "@@ -5484,10 +5484,16 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nString channelId = extras.getString(Constants.WZRK_CHANNEL_ID, \"\");\n+ boolean requiresChannelId = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {\n- if (channelId.isEmpty() || notificationManager.getNotificationChannel(channelId) == null) {\n- String channelIdError = \"Unable to render notification, channelId is required but is wrong/not provided in the notification payload: \" + extras.toString();\n+ String channelIdError = null;\n+ if (channelId.isEmpty()) {\n+ channelIdError = \"Unable to render notification, channelId is required but not provided in the notification payload: \" + extras.toString();\n+ } else if (notificationManager.getNotificationChannel(channelId) == null) {\n+ channelIdError = \"Unable to render notification, channelId: \" + channelId + \" not registered by the app.\";\n+ }\n+ if (channelIdError != null) {\ngetConfigLogger().debug(getAccountId(), channelIdError);\npushValidationResult(new ValidationResult(512, channelIdError));\nreturn;\n@@ -5587,7 +5593,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nNotificationCompat.Builder nb;\n- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {\n+ if (requiresChannelId) {\nnb = new NotificationCompat.Builder(context, channelId);\n// choices here are Notification.BADGE_ICON_NONE = 0, Notification.BADGE_ICON_SMALL = 1, Notification.BADGE_ICON_LARGE = 2. Default is Notification.BADGE_ICON_LARGE\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | add more specific channelId error logging |
116,623 | 25.05.2019 02:01:13 | -19,080 | c4ab08feba125e526880af78fb9dc4f3bfde01bc | hiding status bar only on landscape orientation | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -54,7 +54,10 @@ public final class InAppNotificationActivity extends FragmentActivity implements\npublic void onCreate(Bundle savedInstanceState) {\nsuper.onCreate(savedInstanceState);\n+ int orientation = this.getResources().getConfiguration().orientation;\n+ if(orientation == Configuration.ORIENTATION_LANDSCAPE) {\ngetWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);\n+ }\ntry {\nBundle notif = getIntent().getExtras();\nif (notif == null) throw new IllegalArgumentException();\n@@ -72,7 +75,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nsetRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);\n} catch (Throwable t) {\nLogger.d(\"Error displaying InAppNotification\", t);\n- int orientation = this.getResources().getConfiguration().orientation;\n+\nif (orientation == Configuration.ORIENTATION_LANDSCAPE) {\nLogger.d(\"App in Landscape, dismissing portrait InApp Notification\");\nfinish();\n@@ -89,7 +92,6 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nsetRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);\n} catch (Throwable t) {\nLogger.d(\"Error displaying InAppNotification\", t);\n- int orientation = this.getResources().getConfiguration().orientation;\nif (orientation == Configuration.ORIENTATION_PORTRAIT) {\nLogger.d(\"App in Portrait, dismissing landscape InApp Notification\");\nfinish();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | hiding status bar only on landscape orientation |
116,623 | 25.05.2019 02:52:56 | -19,080 | 052ffdee16a9a8a980a6d7da37e46d679ed36433 | Preparing for release v3.5.1 | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/build.gradle",
"new_path": "AndroidStarter/app/build.gradle",
"diff": "@@ -29,7 +29,7 @@ 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.5.0', ext: 'aar') //CleverTap Android SDK, make sure the AAR file is in the libs folder\n+ implementation (name: 'clevertap-android-sdk-3.5.1', ext: 'aar') //CleverTap Android SDK, make sure the AAR file is in the libs folder\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.5.0.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.5.0.aar",
"diff": "Binary files a/AndroidStarter/app/libs/clevertap-android-sdk-3.5.0.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.5.1.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.5.1.aar",
"diff": "Binary files /dev/null and b/AndroidStarter/app/libs/clevertap-android-sdk-3.5.1.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n+### Version 3.5.1 (May 24, 2019)\n+* Removes requirement for Manifest entry to enable automatic recording of Push Notification Viewed event\n+* Fixes certain Landscape InApp Notification display issues\n+\n### Version 3.5.0 (May 17, 2019)\n+* For raising Notification Viewed event in Push Notifications and using In-Apps in Landscape mode, please use CleverTap SDK v3.5.1\n* Adds the ability to set a custom Device ID (CleverTap ID)\n* Adds the ability to record Notification Viewed event for Push Notifications\n* Adds support to record events in a WebView\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.5.0'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.5.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.5.0', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.5.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.5.0'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.5.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.5.0.aar",
"new_path": "clevertap-android-sdk-3.5.0.aar",
"diff": "Binary files a/clevertap-android-sdk-3.5.0.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "clevertap-android-sdk-3.5.1.aar",
"new_path": "clevertap-android-sdk-3.5.1.aar",
"diff": "Binary files /dev/null and b/clevertap-android-sdk-3.5.1.aar differ\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Preparing for release v3.5.1 |
116,614 | 16.07.2019 17:28:43 | 25,200 | d7948b06b4115fae4a20021ff7154311362968f9 | remove gcm and clean up libs | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -135,13 +135,8 @@ install {\n}\n}\ndependencies {\n- compileOnly files('libs/play-services-base-9.8.0.jar')\n- compileOnly files('libs/play-services-basement-9.8.0.jar')\n- compileOnly files('libs/play-services-gcm-9.8.0.jar')\n- compileOnly files('libs/play-services-iid-9.8.0.jar')\n- compileOnly files('libs/play-services-plus-9.8.0.jar')\n- compileOnly files('libs/firebase-messaging-9.8.0.jar')\n- compileOnly files('libs/firebase-iid-9.8.0.jar')\n+ compileOnly 'com.google.android.gms:play-services-plus:16.0.0'\n+ compileOnly 'com.google.firebase:firebase-messaging:17.3.0'\ncompileOnly 'com.android.support:support-v4:28.0.0'\ncompileOnly 'com.google.android.exoplayer:exoplayer:2.8.4'\ncompileOnly 'com.google.android.exoplayer:exoplayer-hls:2.8.4'\n@@ -149,8 +144,6 @@ 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-\n-\n}\ntask sourcesJar(type: Jar) {\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/libs/android-support-v4.jar",
"new_path": "clevertap-android-sdk/libs/android-support-v4.jar",
"diff": "Binary files a/clevertap-android-sdk/libs/android-support-v4.jar and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/libs/firebase-iid-9.8.0.jar",
"new_path": "clevertap-android-sdk/libs/firebase-iid-9.8.0.jar",
"diff": "Binary files a/clevertap-android-sdk/libs/firebase-iid-9.8.0.jar and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/libs/firebase-messaging-9.8.0.jar",
"new_path": "clevertap-android-sdk/libs/firebase-messaging-9.8.0.jar",
"diff": "Binary files a/clevertap-android-sdk/libs/firebase-messaging-9.8.0.jar and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/libs/play-services-base-9.8.0.jar",
"new_path": "clevertap-android-sdk/libs/play-services-base-9.8.0.jar",
"diff": "Binary files a/clevertap-android-sdk/libs/play-services-base-9.8.0.jar and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/libs/play-services-basement-9.8.0.jar",
"new_path": "clevertap-android-sdk/libs/play-services-basement-9.8.0.jar",
"diff": "Binary files a/clevertap-android-sdk/libs/play-services-basement-9.8.0.jar and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/libs/play-services-gcm-9.8.0.jar",
"new_path": "clevertap-android-sdk/libs/play-services-gcm-9.8.0.jar",
"diff": "Binary files a/clevertap-android-sdk/libs/play-services-gcm-9.8.0.jar and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/libs/play-services-iid-9.8.0.jar",
"new_path": "clevertap-android-sdk/libs/play-services-iid-9.8.0.jar",
"diff": "Binary files a/clevertap-android-sdk/libs/play-services-iid-9.8.0.jar and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/libs/play-services-plus-9.8.0.jar",
"new_path": "clevertap-android-sdk/libs/play-services-plus-9.8.0.jar",
"diff": "Binary files a/clevertap-android-sdk/libs/play-services-plus-9.8.0.jar and /dev/null differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -42,8 +42,6 @@ import com.clevertap.android.sdk.ab_testing.CTABTestController;\nimport com.clevertap.android.sdk.ab_testing.CTABTestListener;\nimport com.clevertap.android.sdk.exceptions.CleverTapMetaDataNotFoundException;\nimport com.clevertap.android.sdk.exceptions.CleverTapPermissionsNotSatisfied;\n-import com.google.android.gms.gcm.GoogleCloudMessaging;\n-import com.google.android.gms.iid.InstanceID;\nimport com.google.android.gms.plus.model.people.Person;\nimport com.google.firebase.iid.FirebaseInstanceId;\nimport com.google.firebase.messaging.FirebaseMessaging;\n@@ -810,16 +808,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nif (enabledPushTypes == null) return;\nfor (PushType pushType : enabledPushTypes) {\n- switch (pushType) {\n- case GCM:\n- doGCMRefresh();\n- break;\n- case FCM:\n+ if (pushType == PushType.FCM) {\ndoFCMRefresh();\nbreak;\n- default:\n- //no-op\n- break;\n}\n}\n}\n@@ -856,37 +847,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n});\n}\n- //Push\n- private void doGCMRefresh() {\n- final DeviceInfo _deviceInfo = this.deviceInfo;\n- postAsyncSafely(\"GcmManager#doGCMRefresh\", new Runnable() {\n- @Override\n- public void run() {\n- try {\n- if(getConfig().isAnalyticsOnly()){\n- getConfigLogger().debug(getAccountId(),\"Instance is set for Analytics only, will not request push token\");\n- return;\n- }\n- String freshToken = GCMGetFreshToken(_deviceInfo.getGCMSenderID());\n- if (freshToken == null) return;\n-\n- cacheGCMToken(freshToken);\n-\n- // better safe to always force a push from here\n- pushGCMDeviceToken(freshToken, true, true);\n-\n- try {\n- deviceTokenDidRefresh(freshToken, PushType.GCM);\n- } catch (Throwable t) {\n- //no-op\n- }\n- } catch (Throwable t) {\n- getConfigLogger().verbose(getAccountId(),\"GcmManager: GCM Token error\", t);\n- }\n- }\n- });\n- }\n-\n//Push\n/**\n* request token from FCM\n@@ -908,22 +868,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn token;\n}\n- //Push\n- /**\n- * request token from GCM\n- */\n- private String GCMGetFreshToken(final String senderID) {\n- getConfigLogger().verbose(getAccountId(), \"GcmManager: Requesting a GCM token for Sender ID - \" + senderID);\n- String token = null;\n- try {\n- token = InstanceID.getInstance(context)\n- .getToken(senderID, GoogleCloudMessaging.INSTANCE_ID_SCOPE, null);\n- getConfigLogger().info(getAccountId(), \"GCM token : \" + token);\n- } catch (Throwable t) {\n- getConfigLogger().verbose(getAccountId(), \"GcmManager: Error requesting GCM token\", t);\n- }\n- return token;\n- }\n//Push\nprivate void cacheFCMToken(String token) {\n@@ -941,22 +885,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n- //Push\n- private void cacheGCMToken(String token) {\n- try {\n- if (token == null || alreadyHaveGCMToken(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.GCM_PROPERTY_REG_ID), token);\n- StorageHelper.persist(editor);\n- } catch (Throwable t) {\n- getConfigLogger().verbose(getAccountId(), \"GcmManager: Unable to cache GCM Token\", t);\n- }\n- }\n-\n//Push\nprivate boolean alreadyHaveFCMToken(final String newToken) {\nif (newToken == null) return false;\n@@ -964,25 +892,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn (cachedToken != null && cachedToken.equals(newToken));\n}\n- //Push\n- private boolean alreadyHaveGCMToken(final String newToken) {\n- if (newToken == null) return false;\n- String cachedToken = getCachedGCMToken();\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- //Push\n- private String getCachedGCMToken() {\n- SharedPreferences prefs = getPreferences();\n- return (prefs == null) ? null : getStringFromPrefs(Constants.GCM_PROPERTY_REG_ID, null);\n- }\n-\n//Preferences\nprivate String storageKeyWithSuffix(String key){\nreturn key+\":\"+getConfig().getAccountId();\n@@ -1039,25 +954,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n- //Push\n- private void pushGCMDeviceToken(String token, final boolean register, final boolean forceUpdate) {\n- synchronized (tokenLock) {\n- if (havePushedDeviceToken && !forceUpdate) {\n- getConfigLogger().debug(getAccountId(), \"GcmManager: skipping device token push - already sent.\");\n- return;\n- }\n-\n- try {\n- token = (token != null) ? token : getCachedGCMToken();\n- if (token == null) return;\n- pushDeviceToken(context, token, register, PushType.GCM);\n- havePushedDeviceToken = true;\n- } catch (Throwable t) {\n- getConfigLogger().verbose(getAccountId(), \"GcmManager: pushing device token failed\", t);\n- }\n- }\n- }\n-\n//Push\nprivate void pushFCMDeviceToken(String token, final boolean register, final boolean forceUpdate) {\nsynchronized (tokenLock) {\n@@ -1078,6 +974,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n//Push\n+ @SuppressWarnings(\"SameParameterValue\")\nprivate void deviceTokenDidRefresh(String token, PushType type) {\nif (tokenRefreshListener != null) {\ngetConfigLogger().debug(getAccountId(), \"Notifying devicePushTokenDidRefresh: \" + token);\n@@ -1313,14 +1210,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n*/\n@SuppressWarnings(\"unused\")\npublic String getDevicePushToken(final PushType type) {\n- switch (type) {\n- case GCM:\n- return getCachedGCMToken();\n- case FCM:\n+ if (type == PushType.FCM) {\nreturn getCachedFCMToken();\n- default:\n- return null;\n}\n+ return null;\n}\n//Util\n@@ -2341,7 +2234,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nheader.put(\"tk\", token);\nheader.put(\"l_ts\", getLastRequestTimestamp());\nheader.put(\"f_ts\", getFirstRequestTimestamp());\n- header.put(\"ddnd\",!(this.deviceInfo.getNotificationsEnabledForUser() && (getCachedGCMToken() != null || getCachedFCMToken() != null)));\n+ header.put(\"ddnd\",!(this.deviceInfo.getNotificationsEnabledForUser() && (getCachedFCMToken() != null)));\nif(isBgPing){\nheader.put(\"bk\",1);\nisBgPing = false;\n@@ -5029,20 +4922,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@SuppressWarnings(\"SameParameterValue\")\nprivate void pushDeviceToken(final boolean register, final boolean force) {\nif (enabledPushTypes == null) {\n- //Fixed onUserlogin issue where token was not getting unregistered when enabledPushTypes was not set\nenabledPushTypes = this.deviceInfo.getEnabledPushTypes();\n}\nfor (PushType pushType : enabledPushTypes) {\n- switch (pushType) {\n- case GCM:\n- pushGCMDeviceToken(null, register, force);\n- break;\n- case FCM:\n+ if (pushType == PushType.FCM) {\npushFCMDeviceToken(null, register, force);\n- break;\n- default:\n- //no-op\n- break;\n}\n}\n}\n@@ -5063,20 +4947,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//Push\n- /**\n- * Sends the GCM registration ID to CleverTap.\n- *\n- * @param gcmId The GCM 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(\"WeakerAccess\")\n- public void pushGcmRegistrationId(String gcmId, boolean register) {\n- pushDeviceToken(gcmId, register, PushType.GCM);\n- }\n-\n/**\n* Sends the FCM registration ID to CleverTap.\n*\n@@ -5095,6 +4965,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* For internal use, don't call the public API internally\n*\n*/\n+ @SuppressWarnings(\"SameParameterValue\")\nprivate void pushDeviceToken(final String token, final boolean register, final PushType type) {\npushDeviceToken(this.context, token, register, type);\n}\n@@ -6812,7 +6683,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\npostAsyncSafely(\"runningJobService\", new Runnable() {\n@Override\npublic void run() {\n- if(getCachedFCMToken() == null && getCachedGCMToken() == null){\n+ if(getCachedFCMToken() == null ) {\nLogger.v(getAccountId(),\"Token is not present, not running the Job\");\nreturn;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/DataHandler.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/DataHandler.java",
"diff": "@@ -10,26 +10,6 @@ public class DataHandler {\nthis.weakReference = new WeakReference<>(cleverTapAPI);\n}\n- /**\n- * Sends the GCM registration ID to CleverTap.\n- *\n- * @param gcmId The GCM 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- * @deprecated use {@link CleverTapAPI#pushGcmRegistrationId(String gcmId, boolean register)}\n- */\n- @Deprecated\n- public void pushGcmRegistrationId(String gcmId, boolean register) {\n- CleverTapAPI cleverTapAPI = weakReference.get();\n- if (cleverTapAPI == null) {\n- Logger.d(\"CleverTap Instance is null.\");\n- } else {\n- cleverTapAPI.pushGcmRegistrationId(gcmId, register);\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/DeviceInfo.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"diff": "@@ -18,7 +18,6 @@ import android.view.WindowManager;\nimport java.lang.reflect.Method;\nimport java.util.ArrayList;\n-import java.util.Collections;\nimport java.util.HashMap;\nimport java.util.Map;\nimport java.util.UUID;\n@@ -38,6 +37,7 @@ class DeviceInfo {\nprivate ArrayList<ValidationResult> validationResults = new ArrayList<>();\nArrayList<ValidationResult> getValidationResults() {\n+ // noinspection unchecked\nArrayList<ValidationResult> tempValidationResults = (ArrayList<ValidationResult>) validationResults.clone();\nvalidationResults.clear();\nreturn tempValidationResults;\n@@ -79,7 +79,6 @@ class DeviceInfo {\nreturn this.config.getLogger();\n}\n- @SuppressWarnings({\"WeakerAccess\"})\nprivate void initDeviceID(String cleverTapID) {\n//Show logging as per Manifest flag\n@@ -308,21 +307,8 @@ class DeviceInfo {\nprivate static ArrayList<PushType> enabledPushTypes = null;\nprivate static Boolean isFirebasePresent = null;\n- private static Boolean areGoogleServicesAvailable = null;\nprivate static final String FIREBASE_CLASS_NAME = \"com.google.firebase.messaging.FirebaseMessaging\";\n- private boolean isGCMAvailable() {\n- if (getGCMSenderID() == null) {\n- Logger.d(\"GCM Sender ID unknown, will be unable to request GCM token\");\n- return false;\n- }\n- if (!isGooglePlayServicesAvailable()) {\n- Logger.d(\"Google Play Services unavailable, will be unable to request GCM token\");\n- return false;\n- }\n- return true;\n- }\n-\nprivate boolean isFCMAvailable() {\nif (isFirebasePresent == null) {\ntry {\n@@ -341,39 +327,16 @@ class DeviceInfo {\nif (enabledPushTypes == null) {\nenabledPushTypes = new ArrayList<>();\n- // only return one of fcm and gcm , preferring fcm\n+ // only return fcm\nboolean fcmAvail = isFCMAvailable();\nif (fcmAvail) {\nenabledPushTypes.add(PushType.FCM);\n}\n- if (!fcmAvail && isGCMAvailable()) {\n- enabledPushTypes.add(PushType.GCM);\n- }\n-\n}\nreturn enabledPushTypes;\n}\n- private Boolean isGooglePlayServicesAvailable() {\n- if (areGoogleServicesAvailable == null) {\n- try {\n- Class.forName(\"com.google.android.gms.common.GooglePlayServicesUtil\");\n- areGoogleServicesAvailable = true;\n- Logger.d(\"Google Play services available\");\n- } catch (Throwable t) {\n- Logger.v(\"Error checking for Google Play Services: \" + t.getMessage());\n- areGoogleServicesAvailable = false;\n- }\n- }\n- return areGoogleServicesAvailable;\n- }\n-\n-\n- String getGCMSenderID() {\n- return ManifestInfo.getInstance(this.context).getGCMSenderId();\n- }\n-\nString getFCMSenderID(){\nreturn ManifestInfo.getInstance(this.context).getFCMSenderId();\n}\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/GcmMessageListenerService.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk;\n-\n-import android.os.Bundle;\n-import com.google.android.gms.gcm.GcmListenerService;\n-\n-@Deprecated\n-public class GcmMessageListenerService extends GcmListenerService {\n- @Override\n- public void onMessageReceived(String from, Bundle extras){\n- try {\n- NotificationInfo info = CleverTapAPI.getNotificationInfo(extras);\n- if (info.fromCleverTap) {\n- Logger.d(\"GcmMessageListenerService received notification from CleverTap: \" + extras.toString());\n- CleverTapAPI.createNotification(getApplicationContext(), extras);\n- }\n- } catch (Throwable t) {\n- Logger.d(\"Error handling GCM message\", t);\n- }\n- }\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/GcmTokenListenerService.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk;\n-\n-import com.google.android.gms.iid.InstanceIDListenerService;\n-\n-@Deprecated\n-public class GcmTokenListenerService extends InstanceIDListenerService {\n- @Override\n- public void onTokenRefresh() {\n- Logger.d(\"GcmTokenListenerService: onTokenRefresh\");\n- CleverTapAPI.tokenRefresh(this);\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": "@@ -43,42 +43,20 @@ final class ManifestValidator {\nArrayList<PushType> enabledPushTypes = deviceInfo.getEnabledPushTypes();\nif (enabledPushTypes == null) return;\nfor (PushType pushType : enabledPushTypes) {\n- switch (pushType) {\n- case GCM:\n- try {\n- // use class name string directly here to avoid class not found issues on class import, because we only use one of FCM or GCM\n- validateServiceInManifest((Application) context.getApplicationContext(), \"com.clevertap.android.sdk.GcmMessageListenerService\");\n- validateServiceInManifest((Application) context.getApplicationContext(), \"com.clevertap.android.sdk.GcmTokenListenerService\");\n-\n- }\n- catch (Exception e){\n- Logger.v(\"Receiver/Service issue : \" + e.toString());\n-\n- }\n- catch(Error error){\n- Logger.v(\"FATAL : \"+error.getMessage());\n-\n- }\n- break;\n- case FCM:\n+ //no-op\n+ if (pushType == PushType.FCM) {\ntry {\n// use class name string directly here to avoid class not found issues on class import, because we only use one of FCM or GCM\nvalidateServiceInManifest((Application) context.getApplicationContext(), \"com.clevertap.android.sdk.FcmMessageListenerService\");\nvalidateServiceInManifest((Application) context.getApplicationContext(), \"com.clevertap.android.sdk.FcmTokenListenerService\");\n- }\n- catch (Exception e){\n+ } catch (Exception e) {\nLogger.v(\"Receiver/Service issue : \" + e.toString());\n- }\n- catch(Error error){\n+ } catch (Error error) {\nLogger.v(\"FATAL : \" + error.getMessage());\n}\n- break;\n- default:\n- //no-op\n- break;\n}\n}\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": "package com.clevertap.android.sdk;\npublic enum PushType {\n- FCM(\"fcm\"),\n- GCM(\"gcm\");\n+ FCM(\"fcm\");\nprivate final String type;\n@@ -14,8 +13,6 @@ public enum PushType {\nstatic PushType fromString(String type) {\nif (\"fcm\".equals(type)) {\nreturn PushType.FCM;\n- } else if (\"gcm\".equals(type)) {\n- return PushType.GCM;\n} else {\nreturn null;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | remove gcm and clean up libs |
116,623 | 17.07.2019 12:30:42 | -19,080 | 16bb267caad005dd66d54bfae0293d4240b8bcc7 | Fixed all layout warnings | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_carousel_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_carousel_layout.xml",
"diff": "<LinearLayout\nandroid:layout_width=\"wrap_content\"\nandroid:id=\"@+id/carousel_linear_layout\"\n- android:layout_above=\"@id/timestamp_relative_layout\"\n+ android:layout_above=\"@+id/timestamp_relative_layout\"\nandroid:layout_height=\"match_parent\">\n<com.clevertap.android.sdk.CTCarouselViewPager\nandroid:id=\"@+id/image_carousel_viewpager\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_marginEnd=\"10dp\"\nandroid:layout_marginRight=\"10dp\"\n- android:text=\"timestamp\"\nandroid:textColor=\"@android:color/darker_gray\" />\n<ImageView\nandroid:id=\"@+id/carousel_read_circle\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_carousel_text_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_carousel_text_layout.xml",
"diff": "android:layout_marginEnd=\"20dp\"\nandroid:layout_marginRight=\"20dp\"\nandroid:maxLines=\"2\"\n- android:text=\"Title\"\nandroid:textColor=\"@android:color/black\"\nandroid:textStyle=\"bold\" />\n<TextView\nandroid:layout_marginEnd=\"20dp\"\nandroid:layout_marginRight=\"20dp\"\nandroid:maxLines=\"3\"\n- android:text=\"Message\"\nandroid:textColor=\"@android:color/darker_gray\" />\n<RelativeLayout\nandroid:layout_gravity=\"bottom|end\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_marginEnd=\"10dp\"\nandroid:layout_marginRight=\"10dp\"\n- android:text=\"timestamp\"\nandroid:textColor=\"@android:color/darker_gray\" />\n<ImageView\nandroid:id=\"@+id/read_circle\"\nandroid:layout_weight=\"2\"\nandroid:background=\"@android:color/white\"\nandroid:padding=\"2dp\"\n- android:text=\"CTA1\"\nandroid:textColor=\"@android:color/holo_blue_light\"\nandroid:textSize=\"14sp\"\nandroid:visibility=\"gone\" />\nandroid:layout_weight=\"2\"\nandroid:background=\"@android:color/white\"\nandroid:padding=\"2dp\"\n- android:text=\"CTA2\"\nandroid:textColor=\"@android:color/holo_blue_light\"\nandroid:textSize=\"14sp\"\nandroid:visibility=\"gone\" />\nandroid:layout_weight=\"2\"\nandroid:background=\"@android:color/white\"\nandroid:padding=\"2dp\"\n- android:text=\"CTA3\"\nandroid:textColor=\"@android:color/holo_blue_light\"\nandroid:textSize=\"14sp\"\nandroid:visibility=\"gone\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_icon_message_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_icon_message_layout.xml",
"diff": "android:layout_marginEnd=\"20dp\"\nandroid:layout_marginRight=\"20dp\"\nandroid:maxLines=\"2\"\n- android:text=\"Title\"\nandroid:textColor=\"@android:color/black\"\nandroid:textStyle=\"bold\" />\nandroid:layout_marginEnd=\"20dp\"\nandroid:layout_marginRight=\"20dp\"\nandroid:maxLines=\"3\"\n- android:text=\"Message\"\nandroid:textColor=\"@android:color/darker_gray\" />\n</RelativeLayout>\n</LinearLayout>\nandroid:layout_marginEnd=\"10dp\"\nandroid:layout_marginRight=\"10dp\"\nandroid:gravity=\"end\"\n- android:text=\"timestamp\"\nandroid:textColor=\"@android:color/darker_gray\" />\n<ImageView\nandroid:id=\"@+id/cta_linear_layout\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"44dp\"\n- android:layout_alignParentBottom=\"true\"\nandroid:background=\"@android:color/white\"\nandroid:orientation=\"horizontal\"\nandroid:visibility=\"visible\"\nandroid:layout_weight=\"2\"\nandroid:background=\"@android:color/white\"\nandroid:padding=\"2dp\"\n- android:text=\"CTA1\"\nandroid:textColor=\"@android:color/holo_blue_light\"\nandroid:textSize=\"14sp\"\nandroid:visibility=\"gone\" />\nandroid:layout_weight=\"2\"\nandroid:background=\"@android:color/white\"\nandroid:padding=\"2dp\"\n- android:text=\"CTA2\"\nandroid:textColor=\"@android:color/holo_blue_light\"\nandroid:textSize=\"14sp\"\nandroid:visibility=\"gone\" />\nandroid:layout_weight=\"2\"\nandroid:background=\"@android:color/white\"\nandroid:padding=\"2dp\"\n- android:text=\"CTA3\"\nandroid:textColor=\"@android:color/holo_blue_light\"\nandroid:textSize=\"14sp\"\nandroid:visibility=\"gone\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_simple_message_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inbox_simple_message_layout.xml",
"diff": "android:layout_marginEnd=\"20dp\"\nandroid:layout_marginRight=\"20dp\"\nandroid:maxLines=\"2\"\n- android:text=\"Title\"\nandroid:textColor=\"@android:color/black\"\nandroid:textStyle=\"bold\" />\nandroid:layout_marginEnd=\"20dp\"\nandroid:layout_marginRight=\"20dp\"\nandroid:maxLines=\"3\"\n- android:text=\"Message\"\nandroid:textColor=\"@android:color/darker_gray\" />\n</RelativeLayout>\n</LinearLayout>\nandroid:layout_marginEnd=\"10dp\"\nandroid:layout_marginRight=\"10dp\"\nandroid:gravity=\"end\"\n- android:text=\"timestamp\"\nandroid:textColor=\"@android:color/darker_gray\" />\n<ImageView\nandroid:background=\"@android:color/white\"\nandroid:orientation=\"horizontal\"\nandroid:visibility=\"visible\"\n- android:layout_alignParentBottom=\"true\"\nandroid:weightSum=\"6\">\n<Button\nandroid:layout_weight=\"2\"\nandroid:background=\"@android:color/white\"\nandroid:padding=\"2dp\"\n- android:text=\"CTA1\"\nandroid:textColor=\"@android:color/holo_blue_light\"\nandroid:textSize=\"14sp\"\nandroid:visibility=\"gone\" />\nandroid:layout_weight=\"2\"\nandroid:background=\"@android:color/white\"\nandroid:padding=\"2dp\"\n- android:text=\"CTA2\"\nandroid:textColor=\"@android:color/holo_blue_light\"\nandroid:textSize=\"14sp\"\nandroid:visibility=\"gone\" />\nandroid:layout_weight=\"2\"\nandroid:background=\"@android:color/white\"\nandroid:padding=\"2dp\"\n- android:text=\"CTA3\"\nandroid:textColor=\"@android:color/holo_blue_light\"\nandroid:textSize=\"14sp\"\nandroid:visibility=\"gone\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-sw600dp-land/tab_inapp_half_interstitial.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-sw600dp-land/tab_inapp_half_interstitial.xml",
"diff": "android:layout_width=\"342dp\"\nandroid:layout_height=\"85dp\"\nandroid:textSize=\"16sp\"\n- android:visibility=\"visible\" />\n+ android:visibility=\"gone\" />\n<Button\nandroid:id=\"@+id/half_interstitial_button2\"\nandroid:layout_height=\"85dp\"\nandroid:textSize=\"16sp\"\nandroid:layout_marginLeft=\"25dp\"\n- android:visibility=\"visible\"\n+ android:visibility=\"gone\"\nandroid:layout_marginStart=\"12dp\" />\n</LinearLayout>\n</RelativeLayout>\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout/inbox_carousel_text_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout/inbox_carousel_text_layout.xml",
"diff": "android:maxLines=\"1\"\nandroid:layout_marginTop=\"20dp\"\nandroid:layout_marginEnd=\"20dp\"\n- android:text=\"Title\"\nandroid:textStyle=\"bold\"\nandroid:textColor=\"@android:color/black\"\nandroid:layout_marginRight=\"20dp\"\nandroid:id=\"@+id/messageText\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- android:text=\"Message\"\nandroid:maxLines=\"3\"\nandroid:layout_marginLeft=\"20dp\"\nandroid:layout_marginStart=\"20dp\"\nandroid:layout_height=\"wrap_content\"\nandroid:gravity=\"end\"\nandroid:layout_marginRight=\"10dp\"\n- android:text=\"timestamp\"\nandroid:textColor=\"@android:color/darker_gray\"\nandroid:layout_marginEnd=\"10dp\" />\n<ImageView\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout/inbox_icon_message_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout/inbox_icon_message_layout.xml",
"diff": "android:maxLines=\"1\"\nandroid:layout_marginTop=\"10dp\"\nandroid:layout_marginEnd=\"20dp\"\n- android:text=\"Title\"\nandroid:textStyle=\"bold\"\nandroid:textColor=\"@android:color/black\"\nandroid:layout_marginRight=\"20dp\" />\nandroid:id=\"@+id/messageText\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- android:text=\"Message\"\nandroid:maxLines=\"3\"\nandroid:layout_marginLeft=\"10dp\"\nandroid:layout_marginStart=\"10dp\"\nandroid:layout_height=\"wrap_content\"\nandroid:gravity=\"end\"\nandroid:layout_marginRight=\"10dp\"\n- android:text=\"timestamp\"\nandroid:textColor=\"@android:color/darker_gray\"\nandroid:layout_marginEnd=\"10dp\" />\n<ImageView\nandroid:layout_height=\"match_parent\"\nandroid:textSize=\"14sp\"\nandroid:padding=\"2dp\"\n- android:text=\"CTA1\"\nandroid:textColor=\"@android:color/holo_blue_light\"\nandroid:visibility=\"visible\"\nandroid:background=\"@android:color/white\"/>\nandroid:textSize=\"14sp\"\nandroid:padding=\"2dp\"\nandroid:visibility=\"gone\"\n- android:text=\"CTA2\"\nandroid:textColor=\"@android:color/holo_blue_light\"\nandroid:background=\"@android:color/white\"/>\n<Button\nandroid:textSize=\"14sp\"\nandroid:padding=\"2dp\"\nandroid:visibility=\"gone\"\n- android:text=\"CTA3\"\nandroid:textColor=\"@android:color/holo_blue_light\"\nandroid:background=\"@android:color/white\"/>\n</LinearLayout>\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout/inbox_simple_message_layout.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout/inbox_simple_message_layout.xml",
"diff": "android:maxLines=\"1\"\nandroid:layout_marginTop=\"20dp\"\nandroid:layout_marginEnd=\"20dp\"\n- android:text=\"Message title\"\nandroid:textStyle=\"bold\"\nandroid:textColor=\"@android:color/black\"\nandroid:layout_marginRight=\"20dp\" />\nandroid:id=\"@+id/messageText\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- android:text=\"Message\"\nandroid:maxLines=\"3\"\nandroid:layout_marginLeft=\"20dp\"\nandroid:layout_marginStart=\"20dp\"\nandroid:layout_marginTop=\"5dp\"\nandroid:layout_marginRight=\"20dp\"\nandroid:layout_marginEnd=\"20dp\"\n- android:textColor=\"@android:color/darker_gray\"\n- android:layout_below=\"@+id/messageTitle\"/>\n+ android:textColor=\"@android:color/darker_gray\" />\n<LinearLayout\nandroid:id=\"@+id/timestamp_linear_layout\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- android:layout_below=\"@+id/messageText\"\nandroid:orientation=\"horizontal\"\nandroid:layout_marginTop=\"20dp\"\nandroid:layout_marginBottom=\"10dp\"\nandroid:layout_height=\"wrap_content\"\nandroid:gravity=\"end\"\nandroid:layout_marginRight=\"10dp\"\n- android:text=\"timestamp\"\nandroid:textColor=\"@android:color/darker_gray\"\nandroid:layout_marginEnd=\"10dp\" />\n<ImageView\n<View\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"1dp\"\n- android:layout_below=\"@+id/timestamp_linear_layout\"\nandroid:background=\"@android:color/darker_gray\"/>\n</LinearLayout>\n</RelativeLayout>\nandroid:layout_height=\"match_parent\"\nandroid:textSize=\"14sp\"\nandroid:padding=\"2dp\"\n- android:text=\"CTA1\"\nandroid:textColor=\"@android:color/holo_blue_light\"\nandroid:visibility=\"gone\"\nandroid:background=\"@android:color/white\"/>\nandroid:textSize=\"14sp\"\nandroid:padding=\"2dp\"\nandroid:visibility=\"gone\"\n- android:text=\"CTA2\"\nandroid:textColor=\"@android:color/holo_blue_light\"\nandroid:background=\"@android:color/white\"/>\n<Button\nandroid:textSize=\"14sp\"\nandroid:padding=\"2dp\"\nandroid:visibility=\"gone\"\n- android:text=\"CTA3\"\nandroid:textColor=\"@android:color/holo_blue_light\"\nandroid:background=\"@android:color/white\"/>\n</LinearLayout>\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fixed all layout warnings |
116,614 | 17.07.2019 17:43:28 | 25,200 | b9c552571ab2fc052ad0ed0ba93c4339668ac334 | remove previously deprecated and now unused exceptions | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -607,7 +607,7 @@ public class CTABTestController {\n}\nfinal String protocol = \"wss\";\n- final String dashboardDomain = /*@\"dashboard.clevertap.com\"*/ \"43764d4a.ngrok.io\"; // TODO put final production dashboard link\n+ final String dashboardDomain = /*@\"dashboard.clevertap.com\"*/ \"6fde0c32.ngrok.io\"; // TODO put final production dashboard link\nfinal String domain = config.getAccountRegion() != null ? config.getAccountRegion()+\".\"+dashboardDomain : dashboardDomain;\nfinal String url = protocol+\"://\"+domain+\"/\"+getAccountId()+\"/\"+\"websocket/screenab/sdk?tk=\"+config.getAccountToken();\ngetConfigLogger().verbose(getAccountId(), \"Websocket URL - \" + url);\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/exceptions/CleverTapException.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.exceptions;\n-\n-/**\n- * User: Jude Pereira\n- * Date: 19/06/2015\n- * Time: 14:53\n- */\n-@Deprecated\n-public abstract class CleverTapException extends Exception {\n- @SuppressWarnings(\"unused\")\n- public CleverTapException() {\n- }\n-\n- @SuppressWarnings(\"WeakerAccess\")\n- public CleverTapException(String detailMessage) {\n- super(detailMessage);\n- }\n-\n- @SuppressWarnings(\"unused\")\n- public CleverTapException(String detailMessage, Throwable throwable) {\n- super(detailMessage, throwable);\n- }\n-\n- @SuppressWarnings(\"unused\")\n- public CleverTapException(Throwable throwable) {\n- super(throwable);\n- }\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/exceptions/CleverTapMetaDataNotFoundException.java",
"new_path": null,
"diff": "-/*\n- * Author: Jude Pereira\n- * Copyright (c) 2014\n- */\n-\n-package com.clevertap.android.sdk.exceptions;\n-\n-/**\n- * Thrown when the CleverTap SDK mandatory meta data values are not\n- * present in the Android manifest.\n- */\n-@Deprecated\n-public final class CleverTapMetaDataNotFoundException extends CleverTapException {\n- /**\n- * This creates a new exception when mandatory meta data fields are not found.\n- *\n- * @param detailMessage The message describing the cause\n- */\n- public CleverTapMetaDataNotFoundException(String detailMessage) {\n- super(detailMessage);\n- }\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/exceptions/CleverTapPermissionsNotSatisfied.java",
"new_path": null,
"diff": "-/*\n- * Author: Jude Pereira\n- * Copyright (c) 2014\n- */\n-\n-package com.clevertap.android.sdk.exceptions;\n-\n-/**\n- * Thrown when the required permissions necessary for the CleverTap SDK to\n- * operate correctly are not available.\n- */@Deprecated\n-public final class CleverTapPermissionsNotSatisfied extends CleverTapException {\n- /**\n- * This creates a new exception when the permissions are not met.\n- *\n- * @param detailMessage The message describing the specific permission which is not available\n- */\n- public CleverTapPermissionsNotSatisfied(String detailMessage) {\n- super(detailMessage);\n- }\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/exceptions/InvalidEventNameException.java",
"new_path": null,
"diff": "-/*\n- * Author: Jude Pereira\n- * Copyright (c) 2014\n- */\n-\n-package com.clevertap.android.sdk.exceptions;\n-\n-/**\n- * Thrown when an invalid event is handed over to the CleverTap SDK,\n- * when the SDK was expecting a particular event.\n- */\n-@Deprecated\n-public final class InvalidEventNameException extends CleverTapException {\n- /**\n- * This creates a new exception for an invalid item.\n- *\n- * @param detailMessage The message describing the cause\n- */\n- public InvalidEventNameException(String detailMessage) {\n- super(detailMessage);\n- }\n-}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | remove previously deprecated and now unused exceptions |
116,623 | 18.07.2019 17:30:23 | -19,080 | 41bd8cac79c3644e70ade27478efca3da1b966a9 | Refactored ImageCache for Experiments, sending height & width in pixels with device info and added orientation to snapshot | [
{
"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": "@@ -664,100 +664,6 @@ class CTInAppNotification implements Parcelable {\n}\n};\n- // intended to only hold an image reference for the life of the parent CTInAppNotification, in order to facilitate parceling\n- private static class ImageCache {\n- private static final int MIN_CACHE_SIZE = 1024 * 10; // 10mb minimum (in KB)\n- private final static int maxMemory = (int) (Runtime.getRuntime().maxMemory())/1024;\n- private final static int cacheSize = Math.max((maxMemory / 32), MIN_CACHE_SIZE);\n-\n- private static LruCache<String, Bitmap> mMemoryCache;\n-\n- static void init(){\n- synchronized (ImageCache.class) {\n- if(mMemoryCache == null) {\n- Logger.v(\"CTInAppNotification.ImageCache: init with max device memory: \" + String.valueOf(maxMemory) + \"KB and allocated cache size: \" + String.valueOf(cacheSize) + \"KB\");\n- try {\n- mMemoryCache = new LruCache<String, Bitmap>(cacheSize) {\n- @Override\n- protected int sizeOf(String key, Bitmap bitmap) {\n- // The cache size will be measured in kilobytes rather than\n- // number of items.\n- int size = getImageSizeInKB(bitmap);\n- Logger.v( \"CTInAppNotification.ImageCache: have image of size: \"+size + \"KB for key: \" + key);\n- return size;\n- }\n- };\n- } catch (Throwable t) {\n- Logger.v( \"CTInAppNotification.ImageCache: unable to initialize cache: \", t.getCause());\n- }\n- }\n- }\n- }\n-\n- private static int getImageSizeInKB(Bitmap bitmap) {\n- return bitmap.getByteCount() / 1024;\n- }\n-\n- private static int getAvailableMemory() {\n- synchronized (ImageCache.class) {\n- return mMemoryCache == null ? 0 : cacheSize - mMemoryCache.size();\n- }\n- }\n-\n- private static boolean isEmpty() {\n- synchronized (ImageCache.class) {\n- return mMemoryCache.size() <= 0;\n- }\n- }\n-\n- private static void cleanup() {\n- synchronized (ImageCache.class) {\n- if (isEmpty()) {\n- Logger.v( \"CTInAppNotification.ImageCache: cache is empty, removing it\");\n- mMemoryCache = null;\n- }\n- }\n- }\n-\n- static boolean addBitmap(String key, Bitmap bitmap) {\n-\n- if(mMemoryCache==null) return false;\n-\n- if (getBitmap(key) == null) {\n- synchronized (ImageCache.class) {\n- int imageSize = getImageSizeInKB(bitmap);\n- int available = getAvailableMemory();\n- Logger.v( \"CTInAppNotification.ImageCache: image size: \"+ imageSize +\"KB. Available mem: \"+available+ \"KB.\");\n- if (imageSize > getAvailableMemory()) {\n- Logger.v( \"CTInAppNotification.ImageCache: insufficient memory to add image: \" + key);\n- return false;\n- }\n- mMemoryCache.put(key, bitmap);\n- Logger.v( \"CTInAppNotification.ImageCache: added image for key: \" + key);\n- }\n- }\n- return true;\n- }\n-\n- static Bitmap getBitmap(String key) {\n- synchronized (ImageCache.class) {\n- if(key!=null)\n- return mMemoryCache == null ? null : mMemoryCache.get(key);\n- else\n- return null;\n- }\n- }\n-\n- static void removeBitmap(String key) {\n- synchronized (ImageCache.class) {\n- if (mMemoryCache == null) return;\n- mMemoryCache.remove(key);\n- Logger.v( \"CTInAppNotification.LruImageCache: removed image for key: \" + key);\n- cleanup();\n- }\n- }\n- }\n-\n// intended to only hold an gif byte array reference for the life of the parent CTInAppNotification, in order to facilitate parceling\nprivate static class GifCache {\nprivate static final int MIN_CACHE_SIZE = 1024 * 5; // 5mb minimum (in KB)\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": "@@ -6971,9 +6971,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ndeviceInfo.put(\"manufacturer\",this.deviceInfo.getManufacturer());\ndeviceInfo.put(\"model\", this.deviceInfo.getModel());\ndeviceInfo.put(\"sdkVersion\", String.valueOf(this.deviceInfo.getSdkVersion()));\n- deviceInfo.put(\"height\", String.valueOf(this.deviceInfo.getHeight()));\n- deviceInfo.put(\"width\", String.valueOf(this.deviceInfo.getWidth()));\ndeviceInfo.put(\"dpi\", String.valueOf(this.deviceInfo.getDPI()));\n+ deviceInfo.put(\"device_width\",String.valueOf(this.deviceInfo.getWidthPixels()));\n+ deviceInfo.put(\"device_height\",String.valueOf(this.deviceInfo.getHeightPixels()));\nreturn deviceInfo;\n}\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": "@@ -431,6 +431,14 @@ class DeviceInfo {\nreturn getDeviceCachedInfo().dpi;\n}\n+ int getHeightPixels(){\n+ return getDeviceCachedInfo().heightPixels;\n+ }\n+\n+ int getWidthPixels(){\n+ return getDeviceCachedInfo().widthPixels;\n+ }\n+\nboolean getNotificationsEnabledForUser(){\nreturn getDeviceCachedInfo().notificationsEnabled;\n}\n@@ -449,10 +457,11 @@ class DeviceInfo {\nprivate String countryCode;\nprivate int sdkVersion;\nprivate double height;\n+ private int heightPixels;\nprivate double width;\n+ private int widthPixels;\nprivate int dpi;\nprivate boolean notificationsEnabled;\n- private Map<String,String> deviceInfoMap = new HashMap<>();\nDeviceCachedInfo() {\nversionName = getVersionName();\n@@ -467,25 +476,11 @@ class DeviceInfo {\ncountryCode = getCountryCode();\nsdkVersion = getSdkVersion();\nheight = getHeight();\n+ heightPixels = getHeightPixels();\nwidth = getWidth();\n+ widthPixels = getWidthPixels();\ndpi = getDPI();\nnotificationsEnabled = getNotificationEnabledForUser();\n- if(!deviceInfoMap.isEmpty()){\n- deviceInfoMap.put(\"AppVersion\",versionName);\n- deviceInfoMap.put(\"OSName\",osName);\n- deviceInfoMap.put(\"OSVersion\",osVersion);\n- deviceInfoMap.put(\"Manufacturer\",manufacturer);\n- deviceInfoMap.put(\"Model\",model);\n- deviceInfoMap.put(\"Carrier\",carrier);\n- deviceInfoMap.put(\"NetworkType\",networkType);\n- deviceInfoMap.put(\"Bluetooth\",bluetoothVersion);\n- deviceInfoMap.put(\"CountryCode\",countryCode);\n- deviceInfoMap.put(\"Build\",String.valueOf(build));\n- deviceInfoMap.put(\"SDKVersion\",String.valueOf(sdkVersion));\n- deviceInfoMap.put(\"Height\",String.valueOf(height));\n- deviceInfoMap.put(\"Width\",String.valueOf(width));\n- deviceInfoMap.put(\"DPI\",String.valueOf(dpi));\n- }\n}\nprivate String getVersionName() {\n@@ -601,6 +596,16 @@ class DeviceInfo {\nreturn BuildConfig.VERSION_CODE;\n}\n+ private int getHeightPixels(){\n+ WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);\n+ if (wm == null) {\n+ return 0;\n+ }\n+ DisplayMetrics dm = new DisplayMetrics();\n+ wm.getDefaultDisplay().getMetrics(dm);\n+ return dm.heightPixels;\n+ }\n+\nprivate double getHeight(){\nWindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);\nif (wm == null) {\n@@ -613,6 +618,16 @@ class DeviceInfo {\nreturn toTwoPlaces(rHeight);\n}\n+ private int getWidthPixels(){\n+ WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);\n+ if (wm == null) {\n+ return 0;\n+ }\n+ DisplayMetrics dm = new DisplayMetrics();\n+ wm.getDefaultDisplay().getMetrics(dm);\n+ return dm.widthPixels;\n+ }\n+\nprivate double getWidth(){\nWindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);\nif (wm == null) {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ImageCache.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import android.content.Context;\n+import android.graphics.Bitmap;\n+import android.graphics.BitmapFactory;\n+import android.util.Base64;\n+import android.util.LruCache;\n+\n+import java.io.File;\n+import java.io.FileNotFoundException;\n+import java.io.FileOutputStream;\n+import java.io.IOException;\n+import java.io.OutputStream;\n+import java.security.MessageDigest;\n+import java.security.NoSuchAlgorithmException;\n+\n+public class ImageCache {\n+ private static final int MIN_CACHE_SIZE = 1024 * 10; // 10mb minimum (in KB)\n+ private final static int maxMemory = (int) (Runtime.getRuntime().maxMemory())/1024;\n+ private final static int cacheSize = Math.max((maxMemory / 32), MIN_CACHE_SIZE);\n+ private static final String DIRECTORY_PREFIX = \"CT.Images.\";\n+ private static final String FILE_PREFIX = \"CT_IMAGE_\";\n+ private static final int MAX_BITMAP_SIZE = 10000000; // 10 MB\n+ private static LruCache<String, Bitmap> mMemoryCache;\n+\n+ private File imageFileDirectory;\n+ private MessageDigest messageDigest;\n+\n+ public ImageCache(Context context, String module){\n+ this.imageFileDirectory = context.getDir(DIRECTORY_PREFIX+module,Context.MODE_PRIVATE);\n+ MessageDigest messageDigest;\n+ try{\n+ messageDigest = MessageDigest.getInstance(\"SHA1\");\n+ }catch (NoSuchAlgorithmException e) {\n+ Logger.d(\"Images won't be stored because this platform doesn't supply a SHA1 hash function\");\n+ messageDigest = null;\n+ }\n+ this.messageDigest = messageDigest;\n+ init();\n+ }\n+\n+ static void init(){\n+ synchronized (ImageCache.class) {\n+ if(mMemoryCache == null) {\n+ Logger.v(\"CTInAppNotification.ImageCache: init with max device memory: \" + String.valueOf(maxMemory) + \"KB and allocated cache size: \" + String.valueOf(cacheSize) + \"KB\");\n+ try {\n+ mMemoryCache = new LruCache<String, Bitmap>(cacheSize) {\n+ @Override\n+ protected int sizeOf(String key, Bitmap bitmap) {\n+ // The cache size will be measured in kilobytes rather than\n+ // number of items.\n+ int size = getImageSizeInKB(bitmap);\n+ Logger.v( \"CTInAppNotification.ImageCache: have image of size: \"+size + \"KB for key: \" + key);\n+ return size;\n+ }\n+ };\n+ } catch (Throwable t) {\n+ Logger.v( \"CTInAppNotification.ImageCache: unable to initialize cache: \", t.getCause());\n+ }\n+ }\n+ }\n+ }\n+\n+ private static int getImageSizeInKB(Bitmap bitmap) {\n+ return bitmap.getByteCount() / 1024;\n+ }\n+\n+ private static int getAvailableMemory() {\n+ synchronized (ImageCache.class) {\n+ return mMemoryCache == null ? 0 : cacheSize - mMemoryCache.size();\n+ }\n+ }\n+\n+ private static boolean isEmpty() {\n+ synchronized (ImageCache.class) {\n+ return mMemoryCache.size() <= 0;\n+ }\n+ }\n+\n+ private static void cleanup() {\n+ synchronized (ImageCache.class) {\n+ if (isEmpty()) {\n+ Logger.v( \"CTInAppNotification.ImageCache: cache is empty, removing it\");\n+ mMemoryCache = null;\n+ }\n+ }\n+ }\n+\n+ static boolean addBitmap(String key, Bitmap bitmap) {\n+\n+ if(mMemoryCache==null) return false;\n+\n+ if (getBitmap(key) == null) {\n+ synchronized (ImageCache.class) {\n+ int imageSize = getImageSizeInKB(bitmap);\n+ int available = getAvailableMemory();\n+ Logger.v( \"CTInAppNotification.ImageCache: image size: \"+ imageSize +\"KB. Available mem: \"+available+ \"KB.\");\n+ if (imageSize > getAvailableMemory()) {\n+ Logger.v( \"CTInAppNotification.ImageCache: insufficient memory to add image: \" + key);\n+ return false;\n+ }\n+ mMemoryCache.put(key, bitmap);\n+ Logger.v( \"CTInAppNotification.ImageCache: added image for key: \" + key);\n+ }\n+ }\n+ return true;\n+ }\n+\n+ static Bitmap getBitmap(String key) {\n+ synchronized (ImageCache.class) {\n+ if(key!=null)\n+ return mMemoryCache == null ? null : mMemoryCache.get(key);\n+ else\n+ return null;\n+ }\n+ }\n+\n+ static void removeBitmap(String key) {\n+ synchronized (ImageCache.class) {\n+ if (mMemoryCache == null) return;\n+ mMemoryCache.remove(key);\n+ Logger.v( \"CTInAppNotification.LruImageCache: removed image for key: \" + key);\n+ cleanup();\n+ }\n+ }\n+\n+ public Bitmap getImageBitmap(String key, String url){\n+ Bitmap cachedBitmap = getBitmap(key);\n+\n+ if(cachedBitmap == null){\n+ final File imageFile = getImageFile(url);\n+ if(imageFile != null) {\n+ cachedBitmap = decodeImage(imageFile);\n+ addBitmap(key, cachedBitmap);\n+ }else{\n+ return null;\n+ }\n+ }\n+ return cachedBitmap;\n+ }\n+\n+ public File getImageFile(String url) {\n+ final File file = getEmptyFile(url);\n+ byte[] bytes = null;\n+\n+ if (file == null || !file.exists()) {\n+\n+ bytes = Utils.getByteArrayFromImageURL(url);\n+\n+ if (null != bytes) {\n+ if (null != file && bytes.length < MAX_BITMAP_SIZE) {\n+ OutputStream out = null;\n+ try {\n+ out = new FileOutputStream(file);\n+ out.write(bytes);\n+ } catch (FileNotFoundException e) {\n+ //TODO logging\n+ return null;\n+ } catch (IOException e) {\n+ //TODO logging\n+ return null;\n+ } finally {\n+ if (null != out) {\n+ try {\n+ out.close();\n+ } catch (IOException e) {\n+ Logger.v( \"Problem closing output file\", e);\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+ return file;\n+ }\n+\n+ private File getEmptyFile(String url) {\n+ if (null == messageDigest) {\n+ return null;\n+ }\n+\n+ final byte[] hashed = messageDigest.digest(url.getBytes());\n+ final String safeName = FILE_PREFIX + Base64.encodeToString(hashed, Base64.URL_SAFE | Base64.NO_WRAP);\n+ return new File(imageFileDirectory, safeName);\n+ }\n+\n+ private static Bitmap decodeImage(File file) {\n+ BitmapFactory.Options option = new BitmapFactory.Options();\n+ option.inJustDecodeBounds = true;\n+ BitmapFactory.decodeFile(file.getAbsolutePath(), option);\n+ float imageSize = (float) option.outHeight * option.outWidth * 4; // 4 bytes per pixel\n+ if (imageSize > getAvailableMemory()) {\n+ return null;\n+ }\n+\n+ Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath());\n+ if (null == bitmap) {\n+ final boolean ignored = file.delete();\n+ }\n+\n+ return bitmap;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -17,6 +17,7 @@ import android.support.annotation.NonNull;\nimport com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n+import com.clevertap.android.sdk.ImageCache;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.ab_testing.gesture.ConnectionGesture;\nimport com.clevertap.android.sdk.ab_testing.models.CTABVariant;\n@@ -111,6 +112,7 @@ public class CTABTestController {\nprivate JSONObject cachedDeviceInfo;\nprivate CTVarCache varCache;\nprivate UIEditor uiEditor;\n+ private ImageCache imageCache;\nprivate WeakReference<CTABTestListener> listenerWeakReference;\n@@ -138,11 +140,11 @@ public class CTABTestController {\nswitch (type) {\ncase MESSAGE_TYPE_CHANGE_REQUEST:\nmessageCode = ExecutionThreadHandler.MESSAGE_HANDLE_EDITOR_CHANGES_RECEIVED;\n- try {\n- msg = new JSONObject(\"{\\\"type\\\":\\\"change_request\\\",\\\"data\\\":{\\\"actions\\\":[{\\\"args\\\":[[4287903743,\\\"android.graphics.drawable.ColorDrawable\\\"]],\\\"name\\\":\\\"c1361\\\",\\\"path\\\":[{\\\"prefix\\\":\\\"shortest\\\",\\\"index\\\":0,\\\"id\\\":16908290},{\\\"view_class\\\":\\\"android.widget.LinearLayout\\\",\\\"index\\\":0},{\\\"view_class\\\":\\\"android.widget.Button\\\",\\\"index\\\":1}],\\\"property\\\":{\\\"name\\\":\\\"background\\\",\\\"get\\\":{\\\"selector\\\":\\\"getBackground\\\",\\\"parameters\\\":[],\\\"result\\\":{\\\"type\\\":\\\"android.graphics.drawable.Drawable\\\"}},\\\"set\\\":{\\\"selector\\\":\\\"setBackground\\\",\\\"parameters\\\":[{\\\"type\\\":\\\"android.graphics.drawable.ColorDrawable\\\"}]},\\\"classname\\\":\\\"android.view.View\\\"},\\\"change_type\\\":\\\"property\\\"}]}}\");//TODO remove this after test\n- } catch (JSONException e) {\n- e.printStackTrace();\n- }\n+// try {\n+// msg = new JSONObject(\"{\\\"type\\\":\\\"change_request\\\",\\\"data\\\":{\\\"actions\\\":[{\\\"args\\\":[[4287903743,\\\"android.graphics.drawable.ColorDrawable\\\"]],\\\"name\\\":\\\"c1361\\\",\\\"path\\\":[{\\\"prefix\\\":\\\"shortest\\\",\\\"index\\\":0,\\\"id\\\":16908290},{\\\"view_class\\\":\\\"android.widget.LinearLayout\\\",\\\"index\\\":0},{\\\"view_class\\\":\\\"android.widget.Button\\\",\\\"index\\\":1}],\\\"property\\\":{\\\"name\\\":\\\"background\\\",\\\"get\\\":{\\\"selector\\\":\\\"getBackground\\\",\\\"parameters\\\":[],\\\"result\\\":{\\\"type\\\":\\\"android.graphics.drawable.Drawable\\\"}},\\\"set\\\":{\\\"selector\\\":\\\"setBackground\\\",\\\"parameters\\\":[{\\\"type\\\":\\\"android.graphics.drawable.ColorDrawable\\\"}]},\\\"classname\\\":\\\"android.view.View\\\"},\\\"change_type\\\":\\\"property\\\"}]}}\");//TODO remove this after test\n+// } catch (JSONException e) {\n+// e.printStackTrace();\n+// }\nbreak;\ncase MESSAGE_TYPE_CLEAR_REQUEST:\nmessageCode = ExecutionThreadHandler.MESSAGE_HANDLE_EDITOR_CHANGES_CLEARED;\n@@ -205,7 +207,8 @@ public class CTABTestController {\nthis.config = config;\nthis.guid = guid;\nthis.setListener(listener);\n- this.uiEditor = new UIEditor(context, config);\n+ this.imageCache = new ImageCache(context,\"Experiments\");\n+ this.uiEditor = new UIEditor(context, config, imageCache);\nfinal HandlerThread thread = new HandlerThread(CTABTestController.class.getCanonicalName());\nthread.setPriority(Process.THREAD_PRIORITY_BACKGROUND);\n@@ -504,6 +507,7 @@ public class CTABTestController {\nprivate final Set<String> seenExperiments;\nprivate CTABVariant editorSessionVariant;\nprivate HashSet<CTABVariant> editorSessionVariantSet;\n+ private ImageCache imageCache;\n@SuppressWarnings(\"unused\")\nExecutionThreadHandler(Context context, CleverTapInstanceConfig config, Looper looper) {\n@@ -607,7 +611,8 @@ public class CTABTestController {\n}\nfinal String protocol = \"wss\";\n- final String dashboardDomain = /*@\"dashboard.clevertap.com\"*/ \"43764d4a.ngrok.io\"; // TODO put final production dashboard link\n+ final String dashboardDomain = /*@\"dashboard.clevertap.com\"*/ \"fa5487f0.ngrok.io\"; // TODO put final production dashboard link\n+ //final String dashboardDomain = \"eu1-dashboard-staging-2.dashboard.clevertap.com\"; //Staging link\nfinal String domain = config.getAccountRegion() != null ? config.getAccountRegion()+\".\"+dashboardDomain : dashboardDomain;\nfinal String url = protocol+\"://\"+domain+\"/\"+getAccountId()+\"/\"+\"websocket/screenab/sdk?tk=\"+config.getAccountToken();\ngetConfigLogger().verbose(getAccountId(), \"Websocket URL - \" + url);\n@@ -791,6 +796,8 @@ public class CTABTestController {\nwriter.write(\"\\\"activities\\\":\");\nwriter.flush();\nuiEditor.writeSnapshot(out);\n+// writer.write(\",\\\"orientation\\\": \");\n+// writer.write(\"\\\"\"+uiEditor.getActivityOrientation()+\"\\\"\");//TODO test once before commit\n}\nfinal long snapshotTime = System.currentTimeMillis() - startSnapshot;\n@@ -1058,6 +1065,7 @@ public class CTABTestController {\n@Override\npublic void onActivityCreated(Activity activity, Bundle bundle) {\n+ uiEditor.setActivityOrientation(activity);\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/SnapshotBuilder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/SnapshotBuilder.java",
"diff": "@@ -355,7 +355,7 @@ final class SnapshotBuilder {\n}\n@Override\n- public List<RootView> call() throws Exception {\n+ public List<RootView> call() {\nrootViews.clear();\nfinal Set<Activity> liveActivities = this.liveActivities.getAll();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"diff": "@@ -2,13 +2,19 @@ package com.clevertap.android.sdk.ab_testing.uieditor;\nimport android.app.Activity;\nimport android.content.Context;\n+import android.content.pm.ActivityInfo;\n+import android.content.res.Resources;\n+import android.graphics.Bitmap;\n+import android.graphics.drawable.BitmapDrawable;\nimport android.graphics.drawable.ColorDrawable;\n+import android.graphics.drawable.Drawable;\nimport android.os.Handler;\nimport android.os.Looper;\nimport android.view.View;\nimport android.view.ViewTreeObserver;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n+import com.clevertap.android.sdk.ImageCache;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.Utils;\nimport com.clevertap.android.sdk.ab_testing.models.CTABVariant;\n@@ -142,12 +148,14 @@ public class UIEditor {\nprivate final Handler uiThreadHandler;\nprivate final Map<String, List<ViewEdit>> newEdits;\nprivate final Set<UIChangeBinding> currentEdits;\n+ private ImageCache imageCache;\n+ private static int activityOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;\nprivate SnapshotBuilder.ViewSnapshotConfig snapshotConfig;\nprivate ActivitySet activitySet;\n- public UIEditor(Context context, CleverTapInstanceConfig config) {\n+ public UIEditor(Context context, CleverTapInstanceConfig config, ImageCache imageCache) {\nString resourcePackageName = config.getPackageName();\nif(null == resourcePackageName){\nresourcePackageName = context.getPackageName();\n@@ -158,6 +166,26 @@ public class UIEditor {\nnewEdits = new HashMap<>();\ncurrentEdits = new HashSet<>();\nactivitySet = new ActivitySet();\n+ this.imageCache = imageCache;\n+ }\n+\n+ public String getActivityOrientation() {\n+ switch(activityOrientation){\n+ case ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED :\n+ return \"unspecified\";\n+ case ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE:\n+ case ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE:\n+ case ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE :\n+ case ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE:\n+ return \"landscape\";\n+ case ActivityInfo.SCREEN_ORIENTATION_PORTRAIT:\n+ case ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT:\n+ case ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT:\n+ case ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT:\n+ return \"portrait\";\n+ default: return \"portrait\";\n+\n+ }\n}\nprivate Logger getConfigLogger() {\n@@ -173,6 +201,10 @@ public class UIEditor {\nhandleNewEditsOnUiThread();\n}\n+ public void setActivityOrientation(Activity activity){\n+ activityOrientation = activity.getResources().getConfiguration().orientation;\n+ }\n+\npublic void removeActivity(Activity activity) {\nactivitySet.remove(activity);\n}\n@@ -307,10 +339,10 @@ public class UIEditor {\n}\n}\n} catch (JSONException e) {\n- //TODO logging here\n+ getConfigLogger().verbose(getAccountId(),\"Unable to parse JSON while loading View Properties - \"+e.getLocalizedMessage());\nreturn null;\n} catch (final ClassNotFoundException e) {\n- //TODO logging here\n+ getConfigLogger().verbose(getAccountId(),\"Class not found while loading View Properties - \"+e.getLocalizedMessage());\nreturn null;\n}\nreturn properties;\n@@ -338,13 +370,13 @@ public class UIEditor {\n}\nreturn new ViewProperty(propName, targetClass, accessor, mutatorName);\n} catch (final NoSuchMethodException e) {\n- //TODO add logging\n+ getConfigLogger().verbose(getAccountId(),\"No such method found while generating View Property - \"+ e.getLocalizedMessage());\nreturn null;\n} catch (final JSONException e) {\n- //TODO add logging\n+ getConfigLogger().verbose(getAccountId(),\"Unable to parse JSON while generating View Property - \"+ e.getLocalizedMessage());\nreturn null;\n} catch (final ClassNotFoundException e) {\n- //TODO add logging\n+ getConfigLogger().verbose(getAccountId(),\"Class not found while generating View Property - \"+ e.getLocalizedMessage());\nreturn null;\n}\n}\n@@ -373,7 +405,7 @@ public class UIEditor {\ntry {\ntargetClass = Class.forName(targetClassName);\n} catch (final ClassNotFoundException e) {\n- //TODO logging\n+ getConfigLogger().verbose(getAccountId(),\"Class not found while generating UI change - \"+ e.getLocalizedMessage());\nreturn null;\n}\n@@ -401,10 +433,10 @@ public class UIEditor {\nreturn null;\n}\n} catch (final NoSuchMethodException e) {\n- //TODO logging\n+ getConfigLogger().verbose(getAccountId(),\"No such method found while generating UI change - \"+ e.getLocalizedMessage());\nreturn null;\n} catch (final JSONException e) {\n- //TODO logging\n+ getConfigLogger().verbose(getAccountId(),\"Unable to parse JSON while generating UI change - \"+ e.getLocalizedMessage());\nreturn null;\n}\nreturn new UIChange(viewEdit, assetsLoaded);\n@@ -491,12 +523,9 @@ public class UIEditor {\n} else if (\"float\".equals(type) || \"java.lang.Float\".equals(type)) {\nreturn ((Number) jsonArgument).floatValue();\n} else if (\"android.graphics.drawable.Drawable\".equals(type)) {\n- // For historical reasons, we attempt to interpret generic Drawables as BitmapDrawables\n- //return readBitmapDrawable((JSONObject) jsonArgument, assetsLoaded);// TODO link this up with new ImageCache\n- return null;\n+ return readBitmapDrawable((JSONObject) jsonArgument, assetsLoaded);\n} else if (\"android.graphics.drawable.BitmapDrawable\".equals(type)) {\n- //return readBitmapDrawable((JSONObject) jsonArgument, assetsLoaded);//TODO link this up with new ImageCache\n- return null;\n+ return readBitmapDrawable((JSONObject) jsonArgument, assetsLoaded);\n} else if (\"android.graphics.drawable.ColorDrawable\".equals(type)) {\nint colorValue = ((Number) jsonArgument).intValue();\nreturn new ColorDrawable(colorValue);\n@@ -505,7 +534,45 @@ public class UIEditor {\nreturn null;\n}\n} catch (final ClassCastException e) {\n- //TODO logging\n+ getConfigLogger().verbose(getAccountId(),\"Error casting class while converting argument - \"+ e.getLocalizedMessage());\n+ return null;\n+ }\n+ }\n+\n+ private Drawable readBitmapDrawable(JSONObject description, List<String> assetsLoaded) {\n+ try {\n+ final String url = description.getString(\"url\");\n+ final String key = description.getString(\"key\");\n+ final boolean useBounds;\n+ final int left;\n+ final int right;\n+ final int top;\n+ final int bottom;\n+ if (description.isNull(\"dimensions\")) {\n+ left = right = top = bottom = 0;\n+ useBounds = false;\n+ } else {\n+ final JSONObject dimensions = description.getJSONObject(\"dimensions\");\n+ left = dimensions.getInt(\"left\");\n+ right = dimensions.getInt(\"right\");\n+ top = dimensions.getInt(\"top\");\n+ bottom = dimensions.getInt(\"bottom\");\n+ useBounds = true;\n+ }\n+\n+ final Bitmap image;\n+ image = imageCache.getImageBitmap(key,url);\n+ assetsLoaded.add(url);\n+\n+\n+ final Drawable ret = new BitmapDrawable(Resources.getSystem(), image);\n+ if (useBounds) {\n+ ret.setBounds(left, top, right, bottom);\n+ }\n+\n+ return ret;\n+ } catch (JSONException e) {\n+ getConfigLogger().verbose(getAccountId(),\"Unable to parse JSON while reading Bitmap from payload - \"+ e.getLocalizedMessage());\nreturn null;\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Refactored ImageCache for Experiments, sending height & width in pixels with device info and added orientation to snapshot |
116,614 | 18.07.2019 19:21:32 | 25,200 | 35eb7d0ecb34e9b1052204c9e531ff57b41d7398 | refactor image cache and snapshot orientation handling | [
{
"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": "@@ -511,7 +511,7 @@ class CTInAppNotification implements Parcelable {\nfor (CTInAppNotificationMedia inAppMedia : this.mediaList){\nif (inAppMedia.getMediaUrl() != null){\nif (!inAppMedia.getContentType().equals(\"image/gif\")) {\n- ImageCache.removeBitmap(inAppMedia.getCacheKey());\n+ ImageCache.removeBitmap(inAppMedia.getCacheKey(), false);\nLogger.v(\"Deleted image - \"+inAppMedia.getCacheKey());\n} else {\nGifCache.removeByteArray(inAppMedia.getCacheKey());\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": "@@ -18,8 +18,6 @@ import android.view.WindowManager;\nimport java.lang.reflect.Method;\nimport java.util.ArrayList;\n-import java.util.HashMap;\n-import java.util.Map;\nimport java.util.UUID;\nclass DeviceInfo {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ImageCache.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ImageCache.java",
"diff": "@@ -18,31 +18,34 @@ public class ImageCache {\nprivate static final int MIN_CACHE_SIZE = 1024 * 10; // 10mb minimum (in KB)\nprivate final static int maxMemory = (int) (Runtime.getRuntime().maxMemory())/1024;\nprivate final static int cacheSize = Math.max((maxMemory / 32), MIN_CACHE_SIZE);\n- private static final String DIRECTORY_PREFIX = \"CT.Images.\";\n- private static final String FILE_PREFIX = \"CT_IMAGE_\";\nprivate static final int MAX_BITMAP_SIZE = 10000000; // 10 MB\nprivate static LruCache<String, Bitmap> mMemoryCache;\n- private File imageFileDirectory;\n- private MessageDigest messageDigest;\n+ private static final String DIRECTORY_NAME = \"CleverTap.Images.\";\n+ private static final String FILE_PREFIX = \"CT_IMAGE_\";\n+ private static File imageFileDirectory;\n+ private static MessageDigest messageDigest;\n- public ImageCache(Context context, String module){\n- this.imageFileDirectory = context.getDir(DIRECTORY_PREFIX+module,Context.MODE_PRIVATE);\n- MessageDigest messageDigest;\n+ public static void initWithPersistence(Context context) {\n+ synchronized (ImageCache.class) {\n+ if (imageFileDirectory == null) {\n+ imageFileDirectory = context.getDir(DIRECTORY_NAME,Context.MODE_PRIVATE);\n+ }\n+ if (messageDigest == null) {\ntry {\nmessageDigest = MessageDigest.getInstance(\"SHA1\");\n} catch (NoSuchAlgorithmException e) {\n- Logger.d(\"Images won't be stored because this platform doesn't supply a SHA1 hash function\");\n- messageDigest = null;\n+ Logger.d(\"CleverTap.ImageCache: image file system caching unavailable as SHA1 hash function not available on platform\");\n+ }\n+ }\n}\n- this.messageDigest = messageDigest;\ninit();\n}\n- static void init(){\n+ public static void init(){\nsynchronized (ImageCache.class) {\nif(mMemoryCache == null) {\n- Logger.v(\"CTInAppNotification.ImageCache: init with max device memory: \" + String.valueOf(maxMemory) + \"KB and allocated cache size: \" + String.valueOf(cacheSize) + \"KB\");\n+ Logger.v(\"CleverTap.ImageCache: init with max device memory: \" + maxMemory + \"KB and allocated cache size: \" + cacheSize + \"KB\");\ntry {\nmMemoryCache = new LruCache<String, Bitmap>(cacheSize) {\n@Override\n@@ -50,121 +53,140 @@ public class ImageCache {\n// The cache size will be measured in kilobytes rather than\n// number of items.\nint size = getImageSizeInKB(bitmap);\n- Logger.v( \"CTInAppNotification.ImageCache: have image of size: \"+size + \"KB for key: \" + key);\n+ Logger.v( \"CleverTap.ImageCache: have image of size: \"+size + \"KB for key: \" + key);\nreturn size;\n}\n};\n} catch (Throwable t) {\n- Logger.v( \"CTInAppNotification.ImageCache: unable to initialize cache: \", t.getCause());\n- }\n- }\n- }\n- }\n-\n- private static int getImageSizeInKB(Bitmap bitmap) {\n- return bitmap.getByteCount() / 1024;\n- }\n-\n- private static int getAvailableMemory() {\n- synchronized (ImageCache.class) {\n- return mMemoryCache == null ? 0 : cacheSize - mMemoryCache.size();\n- }\n+ Logger.v( \"CleverTap.ImageCache: unable to initialize cache: \", t.getCause());\n}\n-\n- private static boolean isEmpty() {\n- synchronized (ImageCache.class) {\n- return mMemoryCache.size() <= 0;\n}\n}\n-\n- private static void cleanup() {\n- synchronized (ImageCache.class) {\n- if (isEmpty()) {\n- Logger.v( \"CTInAppNotification.ImageCache: cache is empty, removing it\");\n- mMemoryCache = null;\n}\n- }\n- }\n-\n- static boolean addBitmap(String key, Bitmap bitmap) {\n+ @SuppressWarnings(\"WeakerAccess\")\n+ // only adds to mem cache, use getForFetchBitmap for disk cache support\n+ public static boolean addBitmap(String key, Bitmap bitmap) {\nif (mMemoryCache == null) return false;\n-\n- if (getBitmap(key) == null) {\n+ if (getBitmapFromMemCache(key) == null) {\nsynchronized (ImageCache.class) {\nint imageSize = getImageSizeInKB(bitmap);\nint available = getAvailableMemory();\n- Logger.v( \"CTInAppNotification.ImageCache: image size: \"+ imageSize +\"KB. Available mem: \"+available+ \"KB.\");\n+ Logger.v( \"CleverTap.ImageCache: image size: \"+ imageSize +\"KB. Available mem: \"+available+ \"KB.\");\nif (imageSize > getAvailableMemory()) {\n- Logger.v( \"CTInAppNotification.ImageCache: insufficient memory to add image: \" + key);\n+ Logger.v( \"CleverTap.ImageCache: insufficient memory to add image: \" + key);\nreturn false;\n}\nmMemoryCache.put(key, bitmap);\n- Logger.v( \"CTInAppNotification.ImageCache: added image for key: \" + key);\n+ Logger.v( \"CleverTap.ImageCache: added image for key: \" + key);\n}\n}\nreturn true;\n}\n- static Bitmap getBitmap(String key) {\n+ // only checks mem cache and will not load a missing image, use getForFetchBitmap for loading and disk cache support\n+ @SuppressWarnings(\"WeakerAccess\")\n+ public static Bitmap getBitmap(String key) {\nsynchronized (ImageCache.class) {\n- if(key!=null)\n+ if (key != null) {\nreturn mMemoryCache == null ? null : mMemoryCache.get(key);\n- else\n+ } else {\n+ return null;\n+ }\n+ }\n+ }\n+ // potentially blocking, will always persist to the file system. for mem cache only use addBitmap + getBitmap\n+ public static Bitmap getOrFetchBitmap(String url) {\n+ Bitmap bitmap = getBitmap(url);\n+ if(bitmap == null){\n+ final File imageFile = getOrFetchAndWriteImageFile(url);\n+ if(imageFile != null) {\n+ bitmap = decodeImageFromFile(imageFile);\n+ addBitmap(url, bitmap);\n+ } else{\nreturn null;\n}\n}\n+ return bitmap;\n+ }\n- static void removeBitmap(String key) {\n+ @SuppressWarnings(\"WeakerAccess\")\n+ public static void removeBitmap(String key, boolean isPersisted) {\nsynchronized (ImageCache.class) {\n+ if (isPersisted) {\n+ removeFromFileSystem(key);\n+ }\nif (mMemoryCache == null) return;\nmMemoryCache.remove(key);\n- Logger.v( \"CTInAppNotification.LruImageCache: removed image for key: \" + key);\n+ Logger.v( \"CleverTap.ImageCache: removed image for key: \" + key);\ncleanup();\n}\n}\n- public Bitmap getImageBitmap(String key, String url){\n- Bitmap cachedBitmap = getBitmap(key);\n+ private static int getImageSizeInKB(Bitmap bitmap) {\n+ return bitmap.getByteCount() / 1024;\n+ }\n- if(cachedBitmap == null){\n- final File imageFile = getImageFile(url);\n- if(imageFile != null) {\n- cachedBitmap = decodeImage(imageFile);\n- addBitmap(key, cachedBitmap);\n- }else{\n- return null;\n+ private static int getAvailableMemory() {\n+ synchronized (ImageCache.class) {\n+ return mMemoryCache == null ? 0 : cacheSize - mMemoryCache.size();\n+ }\n}\n+\n+ private static boolean isEmpty() {\n+ synchronized (ImageCache.class) {\n+ return mMemoryCache.size() <= 0;\n}\n- return cachedBitmap;\n}\n- public File getImageFile(String url) {\n- final File file = getEmptyFile(url);\n- byte[] bytes = null;\n+ private static void cleanup() {\n+ synchronized (ImageCache.class) {\n+ if (isEmpty()) {\n+ Logger.v( \"CTInAppNotification.ImageCache: cache is empty, removing it\");\n+ mMemoryCache = null;\n+ }\n+ }\n+ }\n- if (file == null || !file.exists()) {\n+ private static Bitmap getBitmapFromMemCache(String key) {\n+ if (key != null) {\n+ return mMemoryCache == null ? null : mMemoryCache.get(key);\n+ }\n+ return null;\n+ }\n- bytes = Utils.getByteArrayFromImageURL(url);\n+ private static void removeFromFileSystem(String url) {\n+ final File file = getFile(url);\n+ if (file != null && file.exists()) {\n+ //noinspection ResultOfMethodCallIgnored\n+ file.delete();\n+ }\n+ }\n- if (null != bytes) {\n- if (null != file && bytes.length < MAX_BITMAP_SIZE) {\n+ // will do a blocking network fetch if file does not already exist\n+ private static File getOrFetchAndWriteImageFile(String url) {\n+ final File file = getFile(url);\n+ byte[] bytes;\n+ if (file == null || !file.exists()) {\n+ bytes = Utils.getByteArrayFromImageURL(url); // blocking network operation\n+ if (bytes != null) {\n+ if (file != null && bytes.length < MAX_BITMAP_SIZE) {\nOutputStream out = null;\ntry {\nout = new FileOutputStream(file);\nout.write(bytes);\n} catch (FileNotFoundException e) {\n- //TODO logging\n+ Logger.v( \"CleverTap.ImageCache: error writing image file\", e);\nreturn null;\n} catch (IOException e) {\n- //TODO logging\n+ Logger.v( \"CleverTap.ImageCache: error writing image file\", e);\nreturn null;\n} finally {\n- if (null != out) {\n+ if (out != null) {\ntry {\nout.close();\n} catch (IOException e) {\n- Logger.v( \"Problem closing output file\", e);\n+ Logger.v( \"CleverTap.ImageCache: error closing image output file\", e);\n}\n}\n}\n@@ -174,30 +196,29 @@ public class ImageCache {\nreturn file;\n}\n- private File getEmptyFile(String url) {\n- if (null == messageDigest) {\n+ private static File getFile(String url) {\n+ if (messageDigest == null) {\nreturn null;\n}\n-\nfinal byte[] hashed = messageDigest.digest(url.getBytes());\nfinal String safeName = FILE_PREFIX + Base64.encodeToString(hashed, Base64.URL_SAFE | Base64.NO_WRAP);\nreturn new File(imageFileDirectory, safeName);\n}\n- private static Bitmap decodeImage(File file) {\n- BitmapFactory.Options option = new BitmapFactory.Options();\n- option.inJustDecodeBounds = true;\n- BitmapFactory.decodeFile(file.getAbsolutePath(), option);\n- float imageSize = (float) option.outHeight * option.outWidth * 4; // 4 bytes per pixel\n+ private static Bitmap decodeImageFromFile(File file) {\n+ BitmapFactory.Options options = new BitmapFactory.Options();\n+ options.inJustDecodeBounds = true;\n+ BitmapFactory.decodeFile(file.getAbsolutePath(), options);\n+ float imageSize = (float) options.outHeight * options.outWidth * 4;\nif (imageSize > getAvailableMemory()) {\n+ Logger.v( \"CleverTap.ImageCache: image too large to decode\");\nreturn null;\n}\n-\nBitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath());\n- if (null == bitmap) {\n- final boolean ignored = file.delete();\n+ if (bitmap == null) {\n+ //noinspection ResultOfMethodCallIgnored\n+ file.delete();\n}\n-\nreturn bitmap;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -112,7 +112,6 @@ public class CTABTestController {\nprivate JSONObject cachedDeviceInfo;\nprivate CTVarCache varCache;\nprivate UIEditor uiEditor;\n- private ImageCache imageCache;\nprivate WeakReference<CTABTestListener> listenerWeakReference;\n@@ -207,8 +206,7 @@ public class CTABTestController {\nthis.config = config;\nthis.guid = guid;\nthis.setListener(listener);\n- this.imageCache = new ImageCache(context,\"Experiments\");\n- this.uiEditor = new UIEditor(context, config, imageCache);\n+ this.uiEditor = new UIEditor(context, config);\nfinal HandlerThread thread = new HandlerThread(CTABTestController.class.getCanonicalName());\nthread.setPriority(Process.THREAD_PRIORITY_BACKGROUND);\n@@ -502,12 +500,11 @@ public class CTABTestController {\nprivate DashboardClient wsClient;\nprivate static final int CONNECT_TIMEOUT = 5000;\nprivate Context context;\n- private final List<String> editorAssetUrls; // TODO what is this for ???\n+ private final List<String> editorAssetUrls;\nprivate Set<CTABVariant> allExperiments;\nprivate final Set<String> seenExperiments;\nprivate CTABVariant editorSessionVariant;\nprivate HashSet<CTABVariant> editorSessionVariantSet;\n- private ImageCache imageCache;\n@SuppressWarnings(\"unused\")\nExecutionThreadHandler(Context context, CleverTapInstanceConfig config, Looper looper) {\n@@ -611,7 +608,7 @@ public class CTABTestController {\n}\nfinal String protocol = \"wss\";\n- final String dashboardDomain = /*@\"dashboard.clevertap.com\"*/ \"fa5487f0.ngrok.io\"; // TODO put final production dashboard link\n+ final String dashboardDomain = /*@\"dashboard.clevertap.com\"*/ \"01a63471.ngrok.io\"; // TODO put final production dashboard link\n//final String dashboardDomain = \"eu1-dashboard-staging-2.dashboard.clevertap.com\"; //Staging link\nfinal String domain = config.getAccountRegion() != null ? config.getAccountRegion()+\".\"+dashboardDomain : dashboardDomain;\nfinal String url = protocol+\"://\"+domain+\"/\"+getAccountId()+\"/\"+\"websocket/screenab/sdk?tk=\"+config.getAccountToken();\n@@ -728,7 +725,6 @@ public class CTABTestController {\n}\nprivate void applyExperiments(JSONArray experiments, boolean areNew) {\n-\nloadVariants(experiments, areNew);\napplyVariants();\nif (areNew) {\n@@ -796,8 +792,6 @@ public class CTABTestController {\nwriter.write(\"\\\"activities\\\":\");\nwriter.flush();\nuiEditor.writeSnapshot(out);\n-// writer.write(\",\\\"orientation\\\": \");\n-// writer.write(\"\\\"\"+uiEditor.getActivityOrientation()+\"\\\"\");//TODO test once before commit\n}\nfinal long snapshotTime = System.currentTimeMillis() - startSnapshot;\n@@ -936,6 +930,10 @@ public class CTABTestController {\nstopVariants();\ngetEditorSessionVariant().clearActions();\nvarCache.reset();\n+ // TODO\n+ for (final String assetUrl:editorAssetUrls) {\n+ ImageCache.removeBitmap(assetUrl, true);\n+ }\napplyVariants();\n}\n@@ -1064,7 +1062,7 @@ public class CTABTestController {\n@Override\npublic void onActivityCreated(Activity activity, Bundle bundle) {\n- uiEditor.setActivityOrientation(activity);\n+\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/SnapshotBuilder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/SnapshotBuilder.java",
"diff": "@@ -3,6 +3,7 @@ package com.clevertap.android.sdk.ab_testing.uieditor;\nimport android.annotation.SuppressLint;\nimport android.app.Activity;\nimport android.content.res.ColorStateList;\n+import android.content.res.Configuration;\nimport android.graphics.Bitmap;\nimport android.graphics.Canvas;\nimport android.graphics.Color;\n@@ -107,6 +108,9 @@ final class SnapshotBuilder {\nwriter.write(\"\\\"scale\\\":\");\nwriter.write(String.format(\"%s\", rootView.scale));\nwriter.write(\",\");\n+ writer.write(\"\\\"orientation\\\":\");\n+ writer.write(JSONObject.quote(rootView.orientation));\n+ writer.write(\",\");\nwriter.write(\"\\\"serialized_objects\\\":\");\n{\nfinal JsonWriter j = new JsonWriter(writer);\n@@ -276,17 +280,27 @@ final class SnapshotBuilder {\n}\nprivate static class RootView {\n- RootView(String activityName, View rootView) {\n+ private final static String UNSPECIFIED = \"unspecified\";\n+ private final static String LANDSCAPE = \"landscape\";\n+ private final static String PORTRAIT = \"portrait\";\n+\n+ final String activityName;\n+ final View rootView;\n+ Screenshot screenshot;\n+ float scale;\n+ String orientation = UNSPECIFIED;\n+\n+ RootView(String activityName, View rootView, int activityOrientation) {\nthis.activityName = activityName;\nthis.rootView = rootView;\nthis.screenshot = null;\nthis.scale = 1.0f;\n+ setOrientation(activityOrientation);\n}\n- final String activityName;\n- final View rootView;\n- Screenshot screenshot;\n- float scale;\n+ private void setOrientation(final int orientation) {\n+ this.orientation = (orientation == Configuration.ORIENTATION_LANDSCAPE) ? LANDSCAPE : PORTRAIT;\n+ }\n}\nprivate static class Screenshot {\n@@ -358,9 +372,10 @@ final class SnapshotBuilder {\nfor (final Activity activity : activities) {\nfinal String activityName = activity.getClass().getCanonicalName();\n+ final int orientation = activity.getResources().getConfiguration().orientation;\nfinal View view = activity.getWindow().getDecorView().getRootView();\nactivity.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);\n- final RootView rootView = new RootView(activityName, view);\n+ final RootView rootView = new RootView(activityName, view, orientation);\nrootViews.add(rootView);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"diff": "@@ -2,7 +2,6 @@ package com.clevertap.android.sdk.ab_testing.uieditor;\nimport android.app.Activity;\nimport android.content.Context;\n-import android.content.pm.ActivityInfo;\nimport android.content.res.Resources;\nimport android.graphics.Bitmap;\nimport android.graphics.drawable.BitmapDrawable;\n@@ -148,14 +147,14 @@ public class UIEditor {\nprivate final Handler uiThreadHandler;\nprivate final Map<String, List<ViewEdit>> newEdits;\nprivate final Set<UIChangeBinding> currentEdits;\n- private ImageCache imageCache;\n- private static int activityOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;\nprivate SnapshotBuilder.ViewSnapshotConfig snapshotConfig;\nprivate ActivitySet activitySet;\n+ private Context context;\n+ private boolean imageCacheInitialized;\n- public UIEditor(Context context, CleverTapInstanceConfig config, ImageCache imageCache) {\n+ public UIEditor(Context context, CleverTapInstanceConfig config) {\nString resourcePackageName = config.getPackageName();\nif(resourcePackageName == null) {\nresourcePackageName = context.getPackageName();\n@@ -166,26 +165,7 @@ public class UIEditor {\nnewEdits = new HashMap<>();\ncurrentEdits = new HashSet<>();\nactivitySet = new ActivitySet();\n- this.imageCache = imageCache;\n- }\n-\n- public String getActivityOrientation() {\n- switch(activityOrientation){\n- case ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED :\n- return \"unspecified\";\n- case ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE:\n- case ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE:\n- case ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE :\n- case ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE:\n- return \"landscape\";\n- case ActivityInfo.SCREEN_ORIENTATION_PORTRAIT:\n- case ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT:\n- case ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT:\n- case ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT:\n- return \"portrait\";\n- default: return \"portrait\";\n-\n- }\n+ this.context = context;\n}\nprivate Logger getConfigLogger() {\n@@ -201,10 +181,6 @@ public class UIEditor {\nhandleNewEditsOnUiThread();\n}\n- public void setActivityOrientation(Activity activity){\n- activityOrientation = activity.getResources().getConfiguration().orientation;\n- }\n-\npublic void removeActivity(Activity activity) {\nactivitySet.remove(activity);\n}\n@@ -349,7 +325,7 @@ public class UIEditor {\nprivate UIChange generateUIChange(JSONObject data) {\nfinal ViewEdit viewEdit;\n- final List<String> assetsLoaded = new ArrayList<>(); // TODO\n+ final List<String> imageUrls = new ArrayList<>();\ntry {\nfinal JSONArray pathDesc = data.getJSONArray(\"path\");\nfinal List<ViewEdit.PathElement> path = generatePath(pathDesc, resourceIds);\n@@ -378,7 +354,7 @@ public class UIEditor {\nfinal JSONArray argPlusType = argsAndTypes.getJSONArray(i);\nfinal Object jsonArg = argPlusType.get(0);\nfinal String argType = argPlusType.getString(1);\n- methodArgs[i] = castArgumentObject(jsonArg, argType, assetsLoaded);\n+ methodArgs[i] = castArgumentObject(jsonArg, argType, imageUrls);\n}\nViewCaller mutator = null;\n@@ -401,7 +377,7 @@ public class UIEditor {\ngetConfigLogger().verbose(getAccountId(),\"Unable to parse JSON while generating UI change - \"+ e.getLocalizedMessage());\nreturn null;\n}\n- return new UIChange(viewEdit, assetsLoaded);\n+ return new UIChange(viewEdit, imageUrls);\n}\nprivate ViewProperty generateViewProperty(Class<?> targetClass, JSONObject property) {\n@@ -500,25 +476,32 @@ public class UIEditor {\nreturn explicitId;\n}\n- private Object castArgumentObject(Object jsonArgument, String type, List<String> assetsLoaded) {\n+ private Object castArgumentObject(Object jsonArgument, String type, List<String> imageUrls) {\ntry {\n- if (\"java.lang.CharSequence\".equals(type)) { // Because we're assignable\n+ if (type == null) {\n+ return null;\n+ }\n+ switch (type) {\n+ case \"java.lang.CharSequence\":\nreturn jsonArgument;\n- } else if (\"boolean\".equals(type) || \"java.lang.Boolean\".equals(type)) {\n+ case \"boolean\":\n+ case \"java.lang.Boolean\":\nreturn jsonArgument;\n- } else if (\"int\".equals(type) || \"java.lang.Integer\".equals(type)) {\n+ case \"int\":\n+ case \"java.lang.Integer\":\nreturn ((Number) jsonArgument).intValue();\n- } else if (\"float\".equals(type) || \"java.lang.Float\".equals(type)) {\n+ case \"float\":\n+ case \"java.lang.Float\":\nreturn ((Number) jsonArgument).floatValue();\n- } else if (\"android.graphics.drawable.Drawable\".equals(type)) {\n- return readBitmapDrawable((JSONObject) jsonArgument, assetsLoaded);\n- } else if (\"android.graphics.drawable.BitmapDrawable\".equals(type)) {\n- return readBitmapDrawable((JSONObject) jsonArgument, assetsLoaded);\n- } else if (\"android.graphics.drawable.ColorDrawable\".equals(type)) {\n+ case \"android.graphics.drawable.Drawable\":\n+ return readBitmapDrawable((JSONObject) jsonArgument, imageUrls);\n+ case \"android.graphics.drawable.BitmapDrawable\":\n+ return readBitmapDrawable((JSONObject) jsonArgument, imageUrls);\n+ case \"android.graphics.drawable.ColorDrawable\":\nint colorValue = ((Number) jsonArgument).intValue();\nreturn new ColorDrawable(colorValue);\n- } else {\n- //TODO logging\n+ default:\n+ getConfigLogger().verbose(getAccountId(), \"Unhandled argument object type: \" +type);\nreturn null;\n}\n} catch (final ClassCastException e) {\n@@ -527,10 +510,9 @@ public class UIEditor {\n}\n}\n- private Drawable readBitmapDrawable(JSONObject description, List<String> assetsLoaded) {\n+ private Drawable readBitmapDrawable(JSONObject description, List<String> imageUrls) {\ntry {\nfinal String url = description.getString(\"url\");\n- final String key = description.getString(\"key\");\nfinal boolean useBounds;\nfinal int left;\nfinal int right;\n@@ -549,9 +531,8 @@ public class UIEditor {\n}\nfinal Bitmap image;\n- image = imageCache.getImageBitmap(key,url);\n- assetsLoaded.add(url);\n-\n+ image = getOrFetchBitmap(url);\n+ imageUrls.add(url);\nfinal Drawable ret = new BitmapDrawable(Resources.getSystem(), image);\nif (useBounds) {\n@@ -565,4 +546,16 @@ public class UIEditor {\n}\n}\n+ // only call off main thread as initWithPersistence touches the file system\n+ private void initImageCache() {\n+ if (imageCacheInitialized) return;\n+ imageCacheInitialized = true;\n+ ImageCache.initWithPersistence(context);\n+ }\n+\n+ private Bitmap getOrFetchBitmap(String key) {\n+ initImageCache();\n+ return ImageCache.getOrFetchBitmap(key);\n+ }\n+\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | refactor image cache and snapshot orientation handling |
116,623 | 19.07.2019 14:18:53 | -19,080 | f2ca5aed1f251a25ae4d92599c0e4f35abc72d8f | Ensure dashboard images get deleted on disconnect | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -101,6 +101,7 @@ public class CTABTestController {\nprivate static final String MESSAGE_TYPE_GENERIC_ERROR = \"error\";\nprivate static final String MESSAGE_TYPE_VARS_TEST = \"test_vars\";\nprivate static final String MESSAGE_TYPE_MATCHED = \"matched\";\n+ private static final String MESSAGE_TYPE_DISCONNECT = \"disconnect\";\nprivate static final String DATA_KEY = \"data\";\nprivate static final String TYPE_KEY = \"type\";\n@@ -163,6 +164,8 @@ public class CTABTestController {\ncase MESSAGE_TYPE_MATCHED:\nmessageCode = ExecutionThreadHandler.MESSAGE_MATCHED;\nbreak;\n+ case MESSAGE_TYPE_DISCONNECT :\n+ messageCode = ExecutionThreadHandler.MESSAGE_HANDLE_EDITOR_CLOSED;\ndefault:\nbreak;\n}\n@@ -742,6 +745,7 @@ public class CTABTestController {\n}\n}\nuiEditor.applyVariants(allExperiments);\n+ editorAssetUrls.addAll(uiEditor.getEditorImageList());\n}\nprivate void sendHandshake() {\n@@ -930,7 +934,6 @@ public class CTABTestController {\nstopVariants();\ngetEditorSessionVariant().clearActions();\nvarCache.reset();\n- // TODO\nfor (final String assetUrl:editorAssetUrls) {\nImageCache.removeBitmap(assetUrl, true);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"diff": "@@ -147,6 +147,7 @@ public class UIEditor {\nprivate final Handler uiThreadHandler;\nprivate final Map<String, List<ViewEdit>> newEdits;\nprivate final Set<UIChangeBinding> currentEdits;\n+ private final List<String> editorImageList;\nprivate SnapshotBuilder.ViewSnapshotConfig snapshotConfig;\n@@ -165,6 +166,7 @@ public class UIEditor {\nnewEdits = new HashMap<>();\ncurrentEdits = new HashSet<>();\nactivitySet = new ActivitySet();\n+ editorImageList = new ArrayList<>();\nthis.context = context;\n}\n@@ -185,6 +187,10 @@ public class UIEditor {\nactivitySet.remove(activity);\n}\n+ public List<String> getEditorImageList() {\n+ return editorImageList;\n+ }\n+\npublic boolean loadSnapshotConfig(JSONObject data) {\nif (snapshotConfig == null) {\nList<ViewProperty> properties = loadViewProperties(data);\n@@ -218,8 +224,9 @@ public class UIEditor {\nfor (CTABVariant.CTVariantAction action: variant.getActions()) {\nfinal UIChange change = generateUIChange(action.getChange());\nif (change != null) {\n+ editorImageList.addAll(change.imageUrls); //Add all images to a list to be cleared when dashboard disconnects.\nString name = action.getActivityName();\n- ViewEdit viewEdit = change.viewEdit; // TODO what about the UIChange.imageurls ??\n+ ViewEdit viewEdit = change.viewEdit;\nfinal List<ViewEdit> mapElement;\nif (edits.containsKey(name)) {\nmapElement = edits.get(name);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Ensure dashboard images get deleted on disconnect |
116,623 | 19.07.2019 15:34:52 | -19,080 | 6993ba4c407191988686067453e7fb6fc30f7050 | Added CTExperimentsListener instead of providing callback in the SyncListener | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTExperimentsListener.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+public interface CTExperimentsListener {\n+ void CTExperimentsUpdated();\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": "@@ -168,6 +168,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate int currentRequestTimestamp = 0;\nprivate Location locationFromUser = null;\nprivate SyncListener syncListener = null;\n+ private CTExperimentsListener experimentsListener = null;\nprivate ArrayList<PushType> enabledPushTypes = null;\nprivate long appLastSeen = 0;\nprivate int currentSessionId = 0;\n@@ -3082,6 +3083,24 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nthis.syncListener = syncListener;\n}\n+ /**\n+ * Returns the CTExperimentsListener object\n+ * @return The {@link CTExperimentsListener} object\n+ */\n+ @SuppressWarnings(\"WeakerAccess\")\n+ public CTExperimentsListener getCTExperimentsListener() {\n+ return experimentsListener;\n+ }\n+\n+ /**\n+ * This method is used to set the CTExperimentsListener\n+ * @param experimentsListener The {@link CTExperimentsListener} object\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void setCTExperimentsListener(CTExperimentsListener experimentsListener) {\n+ this.experimentsListener = experimentsListener;\n+ }\n+\n/**\n* Returns the DevicePushTokenRefreshListener\n* @return The {@link DevicePushTokenRefreshListener} object\n@@ -6737,11 +6756,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@Override\npublic void ABExperimentsUpdated() {\n- final SyncListener sl;\n+ final CTExperimentsListener sl;\ntry {\n- sl = getSyncListener();\n+ sl = getCTExperimentsListener();\nif (sl != null) {\n- sl.ABExperimentsUpdated();\n+ sl.CTExperimentsUpdated();\n}\n} catch (Throwable t) {\n// Ignore\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/SyncListener.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/SyncListener.java",
"diff": "@@ -5,5 +5,4 @@ import org.json.JSONObject;\npublic interface SyncListener {\nvoid profileDataUpdated(JSONObject updates);\nvoid profileDidInitialize(String CleverTapID);\n- void ABExperimentsUpdated();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -745,7 +745,7 @@ public class CTABTestController {\n}\n}\nuiEditor.applyVariants(allExperiments);\n- editorAssetUrls.addAll(uiEditor.getEditorImageList());\n+ editorAssetUrls.addAll(uiEditor.getEditorImageList());//TODO Darshan place this at the right place.\n}\nprivate void sendHandshake() {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Added CTExperimentsListener instead of providing callback in the SyncListener |
116,614 | 19.07.2019 18:30:32 | 25,200 | 4027ebea4b472bd86ddd20ad58d3068bade0b79d | add variant cleanup | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/models/CTABVariant.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/models/CTABVariant.java",
"diff": "package com.clevertap.android.sdk.ab_testing.models;\n+import com.clevertap.android.sdk.ImageCache;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.Utils;\n@@ -7,6 +8,7 @@ import org.json.JSONArray;\nimport org.json.JSONObject;\nimport java.util.ArrayList;\n+import java.util.List;\npublic class CTABVariant {\n@@ -41,6 +43,7 @@ public class CTABVariant {\nprivate ArrayList<CTVariantAction> actions = new ArrayList<>();\nprivate JSONArray vars = new JSONArray();\nprivate final Object actionsLock = new Object();\n+ private ArrayList<String> imageUrls;\npublic CTABVariant(JSONObject variant) {\ntry {\n@@ -48,6 +51,7 @@ public class CTABVariant {\nexperimentId = variant.optString(\"experiment_id\", \"0\");\nversion = variant.optInt(\"variant_version\", 0);\nthis.id = variantId+\":\"+experimentId;\n+ imageUrls = new ArrayList<>();\ntry {\nfinal JSONArray actions = variant.optJSONArray(\"actions\");\naddActions(actions);\n@@ -142,4 +146,14 @@ public class CTABVariant {\nreturn version;\n}\n+ public void addImageUrls(List<String>urls) {\n+ if (urls == null) return;\n+ this.imageUrls.addAll(urls);\n+ }\n+\n+ public void cleanup() {\n+ for (String url: imageUrls) {\n+ ImageCache.removeBitmap(url, true);\n+ }\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"diff": "@@ -228,6 +228,8 @@ public class UIEditor {\nif (isEditorSession) {\neditorSessionImageUrls.addAll(change.imageUrls); // Add all images to a list to be cleared when dashboard disconnects.\n}\n+ variant.addImageUrls(change.imageUrls);\n+\nString name = action.getActivityName();\nViewEdit viewEdit = change.viewEdit;\nfinal List<ViewEdit> mapElement;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | add variant cleanup |
116,623 | 20.07.2019 20:01:53 | -19,080 | d84173761d4e749c57a94cd6b9ec6418316441e1 | Handling finished and edited experiments from LC | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -501,6 +501,7 @@ public class CTABTestController {\nprivate static final int CONNECT_TIMEOUT = 5000;\nprivate Context context;\nprivate Set<CTABVariant> experiments;\n+ private Set<CTABVariant> storedExperiments;\nprivate CTABVariant editorSessionVariant;\nprivate HashSet<CTABVariant> editorSessionVariantSet;\n@@ -510,6 +511,7 @@ public class CTABTestController {\nthis.config = config;\nthis.context = context;\nthis.experiments = new HashSet<>();\n+ this.storedExperiments = new HashSet<>();\nlock.lock();\n}\n@@ -675,6 +677,7 @@ public class CTABTestController {\nprivate void persistExperiments(JSONArray experiments) {\nfinal SharedPreferences preferences = getSharedPreferences();\nfinal SharedPreferences.Editor editor = preferences.edit();\n+ editor.remove(EXPERIMENTS_KEY); //Clear all data and add new experiments\neditor.putString(EXPERIMENTS_KEY, experiments.toString());\neditor.apply();\n}\n@@ -697,7 +700,28 @@ public class CTABTestController {\n}\n}\n- private void loadVariants(JSONArray experiments){\n+ private Set<CTABVariant> getStoredExperiments(){\n+ Set<CTABVariant> storedSet = new HashSet<>();\n+ final SharedPreferences preferences = getSharedPreferences();\n+ final String storedExperiments = preferences.getString(EXPERIMENTS_KEY, null);\n+ if (null != storedExperiments) {\n+ try {\n+ final JSONArray _experiments = new JSONArray(storedExperiments);\n+ for (int i = 0; i < _experiments.length(); i++) {\n+ final JSONObject nextVariant = _experiments.getJSONObject(i);\n+ final CTABVariant variant = new CTABVariant(nextVariant);\n+ storedSet.add(variant);\n+ }\n+ } catch (JSONException e) {\n+ e.printStackTrace();\n+ }\n+ }else{\n+ getConfigLogger().debug(getAccountId(), \"No Stored Experiments for key: \" + getSharedPrefsName());\n+ }\n+ return storedSet;\n+ }\n+\n+ private void loadVariants(JSONArray experiments, boolean areNew){\nif (null != experiments) {\ntry {\nfinal int experimentsLength = experiments.length();\n@@ -705,6 +729,23 @@ public class CTABTestController {\nfinal JSONObject nextVariant = experiments.getJSONObject(i);\nfinal CTABVariant variant = new CTABVariant(nextVariant);\nthis.experiments.add(variant);\n+\n+ if(areNew){\n+ Set<CTABVariant> tempExperiments = new HashSet<>();\n+ this.storedExperiments = getStoredExperiments();\n+ for(CTABVariant ctabVariant: storedExperiments){\n+ //Condition checks whether each stored experiment is in the Set of all experiments,\n+ //condition is false if the variant info changes in the CTABVariant object\n+ //If condition is false, add the CTABVariant object to tempExperiments Set and\n+ //then clear all experiments and add all tempExperiments. This way we handle finished\n+ //experiments and keep track of edited variants\n+ if(!this.experiments.contains(ctabVariant)){\n+ tempExperiments.add(ctabVariant);\n+ }\n+ }\n+ this.experiments.clear();\n+ this.experiments.addAll(tempExperiments);\n+ }\n}\n} catch (JSONException e) {\ngetConfigLogger().verbose(getAccountId(), \"JSON error when loading ab tests / tweaks, clearing persistent memory\", e);\n@@ -717,10 +758,14 @@ public class CTABTestController {\n}\nprivate void applyExperiments(JSONArray experiments, boolean areNew) {\n- loadVariants(experiments);\n+ loadVariants(experiments, areNew);\napplyVariants();\nif (areNew) {\n- persistExperiments(experiments);\n+ JSONArray persistArray = new JSONArray();\n+ for(CTABVariant variant: this.experiments){\n+ persistArray.put(variant.getExperimentObject());\n+ }\n+ persistExperiments(persistArray);\n}\nnotifyExperimentsUpdated();\n}\n@@ -732,6 +777,7 @@ public class CTABTestController {\nuiEditor.applyVariants(experiments, false);\n}\n+\nprivate void sendHandshake() {\ntry {\nJSONObject deviceInfo = getDeviceInfo();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/models/CTABVariant.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/models/CTABVariant.java",
"diff": "@@ -44,9 +44,11 @@ public class CTABVariant {\nprivate JSONArray vars = new JSONArray();\nprivate final Object actionsLock = new Object();\nprivate ArrayList<String> imageUrls;\n+ private JSONObject experimentObject;\npublic CTABVariant(JSONObject variant) {\ntry {\n+ this.experimentObject = variant;\nvariantId = variant.optString(\"id\", \"0\");\nexperimentId = variant.optString(\"experiment_id\", \"0\");\nversion = variant.optInt(\"variant_version\", 0);\n@@ -156,4 +158,8 @@ public class CTABVariant {\nImageCache.removeBitmap(url, true);\n}\n}\n+\n+ public JSONObject getExperimentObject() {\n+ return experimentObject;\n+ }\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Handling finished and edited experiments from LC |
116,614 | 21.07.2019 16:09:27 | 25,200 | 3efe99b8a0780ec4de8c7ec354fa9937d9e7d377 | refactor variant loading | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ImageCache.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ImageCache.java",
"diff": "@@ -110,7 +110,6 @@ public class ImageCache {\nreturn bitmap;\n}\n- @SuppressWarnings(\"WeakerAccess\")\npublic static void removeBitmap(String key, boolean isPersisted) {\nsynchronized (ImageCache.class) {\nif (isPersisted) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -163,7 +163,7 @@ public class CTABTestController {\nmessageCode = ExecutionThreadHandler.MESSAGE_MATCHED;\nbreak;\ncase MESSAGE_TYPE_DISCONNECT :\n- messageCode = ExecutionThreadHandler.MESSAGE_HANDLE_EDITOR_CLOSED;\n+ messageCode = ExecutionThreadHandler.MESSAGE_HANDLE_DISCONNECT;\ndefault:\nbreak;\n}\n@@ -181,16 +181,6 @@ public class CTABTestController {\nexecutionThreadHandler.sendMessage(m);\n}\n- private void handleDashboardConnect() {\n- final Message m = executionThreadHandler.obtainMessage(ExecutionThreadHandler.MESSAGE_SEND_HANDSHAKE);\n- executionThreadHandler.sendMessage(m);\n- }\n-\n- private void handleDashboardDisconnect() {\n- final Message m = executionThreadHandler.obtainMessage(ExecutionThreadHandler.MESSAGE_HANDLE_EDITOR_CLOSED);\n- executionThreadHandler.sendMessage(m);\n- }\n-\n@SuppressWarnings(\"SameParameterValue\")\nprivate void _registerVar(String name, CTVar.CTVarType type, Object value) {\nthis.varCache.registerVar(name, type, value);\n@@ -482,16 +472,15 @@ public class CTABTestController {\nstatic final int MESSAGE_SEND_SNAPSHOT= 2;\nstatic final int MESSAGE_HANDLE_EDITOR_CHANGES_RECEIVED = 3;\nstatic final int MESSAGE_SEND_DEVICE_INFO = 4;\n- static final int MESSAGE_HANDLE_EDITOR_CLOSED = 5;\n+ static final int MESSAGE_HANDLE_DISCONNECT = 5;\nstatic final int MESSAGE_EXPERIMENTS_RECEIVED = 6;\nstatic final int MESSAGE_HANDLE_EDITOR_CHANGES_CLEARED = 7;\nstatic final int MESSAGE_HANDLE_EDITOR_VARS_RECEIVED = 8;\nstatic final int MESSAGE_SEND_LAYOUT_ERROR = 9;\nstatic final int MESSAGE_PERSIST_EXPERIMENTS = 10;\n- static final int MESSAGE_SEND_HANDSHAKE = 11;\n- static final int MESSAGE_SEND_VARS = 12;\n- static final int MESSAGE_TEST_VARS = 13;\n- static final int MESSAGE_MATCHED = 14;\n+ static final int MESSAGE_SEND_VARS = 11;\n+ static final int MESSAGE_TEST_VARS = 12;\n+ static final int MESSAGE_MATCHED = 13;\nprivate static final String EXPERIMENTS_KEY = \"experiments\";\n@@ -500,8 +489,7 @@ public class CTABTestController {\nprivate DashboardClient wsClient;\nprivate static final int CONNECT_TIMEOUT = 5000;\nprivate Context context;\n- private Set<CTABVariant> experiments;\n- private Set<CTABVariant> storedExperiments;\n+ private Set<CTABVariant> variants;\nprivate CTABVariant editorSessionVariant;\nprivate HashSet<CTABVariant> editorSessionVariantSet;\n@@ -510,8 +498,7 @@ public class CTABTestController {\nsuper(looper);\nthis.config = config;\nthis.context = context;\n- this.experiments = new HashSet<>();\n- this.storedExperiments = new HashSet<>();\n+ this.variants = new HashSet<>();\nlock.lock();\n}\n@@ -519,17 +506,25 @@ public class CTABTestController {\nlock.unlock();\n}\n+ private Logger getConfigLogger(){\n+ return config.getLogger();\n+ }\n+\n+ private String getAccountId(){\n+ return config.getAccountId();\n+ }\n+\nprivate CTABVariant getEditorSessionVariant() {\nif (editorSessionVariant == null) {\ntry {\nJSONObject variant = new JSONObject();\nvariant.put(\"id\", \"0\");\nvariant.put(\"experiment_id\", \"0\");\n- editorSessionVariant = new CTABVariant(variant);\n+ editorSessionVariant = CTABVariant.initWithJSON(variant);\neditorSessionVariantSet = new HashSet<>();\neditorSessionVariantSet.add(editorSessionVariant);\n} catch (Throwable t) {\n- // no-op\n+ getConfigLogger().verbose(getAccountId(), \"Error creating editor session variant\", t);\n}\n}\nreturn editorSessionVariant;\n@@ -551,6 +546,9 @@ public class CTABTestController {\ncase MESSAGE_MATCHED:\nhandleMatched();\nbreak;\n+ case MESSAGE_HANDLE_DISCONNECT:\n+ handleDashboardDisconnect();\n+ break;\ncase MESSAGE_SEND_DEVICE_INFO:\nsendDeviceInfo();\nbreak;\n@@ -572,15 +570,9 @@ public class CTABTestController {\ncase MESSAGE_HANDLE_EDITOR_VARS_RECEIVED:\nhandleEditorVarsReceived((JSONObject) data);\nbreak;\n- case MESSAGE_HANDLE_EDITOR_CLOSED:\n- handleEditorClosed();\n- break;\ncase MESSAGE_PERSIST_EXPERIMENTS:\npersistExperiments((JSONArray) data);\nbreak;\n- case MESSAGE_SEND_HANDSHAKE:\n- sendHandshake();\n- break;\ncase MESSAGE_SEND_VARS:\nsendVars();\nbreak;\n@@ -606,7 +598,7 @@ public class CTABTestController {\n}\nfinal String protocol = \"wss\";\n- final String dashboardDomain = /*@\"dashboard.clevertap.com\"*/ \"c1fce0f6.ngrok.io\"; // TODO put final production dashboard link\n+ final String dashboardDomain = /*@\"dashboard.clevertap.com\"*/ \"aa931949.ngrok.io\"; // TODO put final production dashboard link\n//final String dashboardDomain = \"eu1-dashboard-staging-2.dashboard.clevertap.com\"; //Staging link\nfinal String domain = config.getAccountRegion() != null ? config.getAccountRegion()+\".\"+dashboardDomain : dashboardDomain;\nfinal String url = protocol+\"://\"+domain+\"/\"+getAccountId()+\"/\"+\"websocket/screenab/sdk?tk=\"+config.getAccountToken();\n@@ -619,6 +611,17 @@ public class CTABTestController {\n}\n}\n+ private void closeConnection() {\n+ if (connectionIsValid()) {\n+ try {\n+ getConfigLogger().verbose(getAccountId(), \"disconnecting from dashboard\");\n+ wsClient.closeBlocking();\n+ } catch (final Exception e) {\n+ getConfigLogger().verbose(getAccountId(), \"Unable to close dashboard connection\", e);\n+ }\n+ }\n+ }\n+\nprivate boolean connectionIsValid() {\nreturn wsClient != null && !wsClient.isClosed() && !wsClient.isClosing() && !wsClient.isFlushAndClose();\n}\n@@ -627,12 +630,16 @@ public class CTABTestController {\nreturn wsClient != null && wsClient.isOpen();\n}\n- private Logger getConfigLogger(){\n- return config.getLogger();\n+ private void handleOnOpen() {\n+ sendHandshake();\n}\n- private String getAccountId(){\n- return config.getAccountId();\n+ private void handleOnClose() {\n+ getConfigLogger().verbose(getAccountId(), \"handle websocket on close\");\n+ stopVariants();\n+ getEditorSessionVariant().clearActions();\n+ varCache.reset();\n+ applyVariants();\n}\nprivate BufferedOutputStream getBufferedOutputStream() {\n@@ -677,7 +684,6 @@ public class CTABTestController {\nprivate void persistExperiments(JSONArray experiments) {\nfinal SharedPreferences preferences = getSharedPreferences();\nfinal SharedPreferences.Editor editor = preferences.edit();\n- editor.remove(EXPERIMENTS_KEY); //Clear all data and add new experiments\neditor.putString(EXPERIMENTS_KEY, experiments.toString());\neditor.apply();\n}\n@@ -685,7 +691,7 @@ public class CTABTestController {\nprivate void loadStoredExperiments() {\nfinal SharedPreferences preferences = getSharedPreferences();\nfinal String storedExperiments = preferences.getString(EXPERIMENTS_KEY, null);\n- if (null != storedExperiments) {\n+ if (storedExperiments != null) {\ntry {\ngetConfigLogger().debug(getAccountId(), \"Loading Stored Experiments: \" + storedExperiments + \" for key: \" + getSharedPrefsName());\nfinal JSONArray _experiments = new JSONArray(storedExperiments);\n@@ -700,84 +706,55 @@ public class CTABTestController {\n}\n}\n- private Set<CTABVariant> getStoredExperiments(){\n- Set<CTABVariant> storedSet = new HashSet<>();\n- final SharedPreferences preferences = getSharedPreferences();\n- final String storedExperiments = preferences.getString(EXPERIMENTS_KEY, null);\n- if (null != storedExperiments) {\n- try {\n- final JSONArray _experiments = new JSONArray(storedExperiments);\n- for (int i = 0; i < _experiments.length(); i++) {\n- final JSONObject nextVariant = _experiments.getJSONObject(i);\n- final CTABVariant variant = new CTABVariant(nextVariant);\n- storedSet.add(variant);\n- }\n- } catch (JSONException e) {\n- e.printStackTrace();\n+ private void applyExperiments(JSONArray experiments, boolean areNew) {\n+ loadVariants(experiments);\n+ applyVariants();\n+ if (areNew) {\n+ persistExperiments(experiments);\n}\n- }else{\n- getConfigLogger().debug(getAccountId(), \"No Stored Experiments for key: \" + getSharedPrefsName());\n+ notifyExperimentsUpdated();\n}\n- return storedSet;\n+\n+ private void loadVariants(JSONArray experiments){\n+ if (experiments == null || experiments.length() <= 0) {\n+ return;\n}\n+ // note: experiments here will be all the currently running experiments for the user\n+ try { // TODO test this updating logic\n+ Set<CTABVariant> toRemove = new HashSet<>(this.variants);\n+ Set<CTABVariant> allVariants = new HashSet<>(this.variants);\n- private void loadVariants(JSONArray experiments, boolean areNew){\n- if (null != experiments) {\n- try {\nfinal int experimentsLength = experiments.length();\nfor (int i = 0; i < experimentsLength; i++) {\nfinal JSONObject nextVariant = experiments.getJSONObject(i);\n- final CTABVariant variant = new CTABVariant(nextVariant);\n- this.experiments.add(variant);\n-\n- if(areNew){\n- Set<CTABVariant> tempExperiments = new HashSet<>();\n- this.storedExperiments = getStoredExperiments();\n- for(CTABVariant ctabVariant: storedExperiments){\n- //Condition checks whether each stored experiment is in the Set of all experiments,\n- //condition is false if the variant info changes in the CTABVariant object\n- //If condition is false, add the CTABVariant object to tempExperiments Set and\n- //then clear all experiments and add all tempExperiments. This way we handle finished\n- //experiments and keep track of edited variants\n- if(!this.experiments.contains(ctabVariant)){\n- tempExperiments.add(ctabVariant);\n- }\n+ final CTABVariant variant = CTABVariant.initWithJSON(nextVariant);\n+ if (variant != null) {\n+ boolean added = allVariants.add(variant);\n+ if (added) {\n+ toRemove.remove(variant);\n}\n- this.experiments.clear();\n- this.experiments.addAll(tempExperiments);\n- }\n- }\n- } catch (JSONException e) {\n- getConfigLogger().verbose(getAccountId(), \"JSON error when loading ab tests / tweaks, clearing persistent memory\", e);\n- final SharedPreferences preferences = getSharedPreferences();\n- final SharedPreferences.Editor editor = preferences.edit();\n- editor.remove(EXPERIMENTS_KEY);\n- editor.apply();\n}\n}\n+ if (toRemove.size() > 0) {\n+ for (CTABVariant v : toRemove) {\n+ v.cleanup();\n+ allVariants.remove(v);\n}\n-\n- private void applyExperiments(JSONArray experiments, boolean areNew) {\n- loadVariants(experiments, areNew);\n- applyVariants();\n- if (areNew) {\n- JSONArray persistArray = new JSONArray();\n- for(CTABVariant variant: this.experiments){\n- persistArray.put(variant.getExperimentObject());\n}\n- persistExperiments(persistArray);\n+ this.variants = allVariants;\n+ } catch (JSONException e) {\n+ getConfigLogger().verbose(getAccountId(), \"Error loading variants, clearing all running variants\", e);\n+ this.variants.clear();\n}\n- notifyExperimentsUpdated();\n}\nprivate void applyVariants() {\n- for (CTABVariant variant : experiments) {\n+ for (CTABVariant variant : variants) {\napplyVars(variant.getVars());\n}\n- uiEditor.applyVariants(experiments, false);\n+ uiEditor.applyVariants(variants, false);\n}\n-\nprivate void sendHandshake() {\ntry {\nJSONObject deviceInfo = getDeviceInfo();\n@@ -960,11 +937,8 @@ public class CTABTestController {\nstopVariants();\n}\n- private void handleEditorClosed() {\n- stopVariants();\n- getEditorSessionVariant().clearActions();\n- varCache.reset();\n- applyVariants();\n+ private void handleDashboardDisconnect() {\n+ closeConnection();\n}\nprivate void stopVariants() {\n@@ -982,7 +956,7 @@ public class CTABTestController {\n@Override\npublic void onOpen(ServerHandshake handshakedata) {\ngetConfigLogger().verbose(getAccountId(), \"Websocket connected\");\n- handleDashboardConnect();\n+ handleOnOpen();\n}\n@Override\n@@ -990,6 +964,10 @@ public class CTABTestController {\ngetConfigLogger().verbose(getAccountId(),\"Received message from dashboard:\\n\" + message);\ntry {\nfinal JSONObject messageJson = new JSONObject(message);\n+ if (!connectionIsValid()) {\n+ getConfigLogger().verbose(getAccountId(), \"Dashboard connection is stale, dropping message: \" + message);\n+ return;\n+ }\nhandleDashboardMessage(messageJson);\n} catch (final JSONException e) {\ngetConfigLogger().verbose(getAccountId(),\"Bad JSON message received:\" + message, e);\n@@ -999,7 +977,7 @@ public class CTABTestController {\n@Override\npublic void onClose(int code, String reason, boolean remote) {\ngetConfigLogger().verbose(getAccountId(),\"WebSocket closed. Code: \" + code + \", reason: \" + reason + \"\\nURI: \" + dashboardURI);\n- handleDashboardDisconnect();\n+ handleOnClose();\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/models/CTABVariant.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/models/CTABVariant.java",
"diff": "package com.clevertap.android.sdk.ab_testing.models;\n+import android.support.annotation.NonNull;\n+\nimport com.clevertap.android.sdk.ImageCache;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.Utils;\n@@ -39,35 +41,36 @@ public class CTABVariant {\nprivate String id;\nprivate String variantId;\nprivate String experimentId;\n- private Integer version;\n+ private int version;\nprivate ArrayList<CTVariantAction> actions = new ArrayList<>();\n- private JSONArray vars = new JSONArray();\n+ private JSONArray vars;\nprivate final Object actionsLock = new Object();\nprivate ArrayList<String> imageUrls;\n- private JSONObject experimentObject;\n- public CTABVariant(JSONObject variant) {\n- try {\n- this.experimentObject = variant;\n- variantId = variant.optString(\"id\", \"0\");\n- experimentId = variant.optString(\"experiment_id\", \"0\");\n- version = variant.optInt(\"variant_version\", 0);\n- this.id = variantId+\":\"+experimentId;\n- imageUrls = new ArrayList<>();\n- try {\n- final JSONArray actions = variant.optJSONArray(\"actions\");\n- addActions(actions);\n- } catch (Throwable t) {\n- Logger.v(\"Error loading variant actions\", t);\n- }\n+ public static CTABVariant initWithJSON(JSONObject json) {\ntry {\n- this.vars = variant.optJSONArray(\"vars\");\n- } catch (Throwable t) {\n- Logger.v(\"Error loading variant vars\", t);\n- }\n+ String experimentId = json.optString(\"experiment_id\", \"0\");\n+ String variantId = json.optString(\"id\", \"0\");\n+ int version = json.optInt(\"variant_version\", 0);\n+ final JSONArray actions = json.optJSONArray(\"actions\");\n+ final JSONArray vars = json.optJSONArray(\"vars\");\n+ CTABVariant variant = new CTABVariant(experimentId, variantId, version, actions, vars);\n+ Logger.v(\"Created CTABVariant: \" + variant.toString());\n+ return variant;\n} catch (Throwable t) {\nLogger.v(\"Error creating variant\", t);\n+ return null;\n+ }\n}\n+\n+ private CTABVariant(String experimentId, String variantId, int version, JSONArray actions, JSONArray vars) {\n+ this.experimentId = experimentId;\n+ this.variantId = variantId;\n+ this.id = variantId+\":\"+experimentId;\n+ this.version = version;\n+ imageUrls = new ArrayList<>();\n+ addActions(actions);\n+ this.vars = vars == null ? new JSONArray() : vars;\n}\npublic String getId() {\n@@ -84,6 +87,26 @@ public class CTABVariant {\nreturn experimentId;\n}\n+ @Override\n+ public boolean equals(Object o) {\n+ if (o instanceof CTABVariant) {\n+ CTABVariant other = (CTABVariant) o;\n+ return this.getId().equals(other.getId()) && this.getVersion() == other.getVersion();\n+ }\n+ return false;\n+ }\n+\n+ @Override\n+ public int hashCode() {\n+ return this.getId().hashCode();\n+ }\n+\n+ @NonNull\n+ @Override\n+ public String toString() {\n+ return \"< id: \" + getId() + \", version: \" + getVersion()+ \", actions count: \" + actions.size() + \", vars count: \" + getVars().length() + \" >\";\n+ }\n+\npublic void addActions(JSONArray actions) {\nsynchronized (actionsLock) {\nif (actions == null || actions.length() <= 0) { return; }\n@@ -144,7 +167,7 @@ public class CTABVariant {\nreturn vars;\n}\n- public Integer getVersion() {\n+ public int getVersion() {\nreturn version;\n}\n@@ -158,8 +181,4 @@ public class CTABVariant {\nImageCache.removeBitmap(url, true);\n}\n}\n-\n- public JSONObject getExperimentObject() {\n- return experimentObject;\n- }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewCaller.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewCaller.java",
"diff": "@@ -110,12 +110,14 @@ class ViewCaller {\nboolean argsAreApplicable(Object[] proposedArgs) {\nfinal Class<?>[] paramTypes = targetMethod.getParameterTypes();\nif (proposedArgs.length != paramTypes.length) {\n+ Logger.v(\"Args not applicable: incorrect args length: \" + proposedArgs.length + \" relative to paramtypes length: \" + paramTypes.length); // TODO remove\nreturn false;\n}\nfor (int i = 0; i < proposedArgs.length; i++) {\nfinal Class<?> paramType = assignableArgType(paramTypes[i]);\n- if (null == proposedArgs[i]) {\n+ if (proposedArgs[i] == null) {\n+ Logger.v(\"Args not applicable: proposed args is null\"); // TODO remove\nif (paramType == byte.class ||\nparamType == short.class ||\nparamType == int.class ||\n@@ -129,6 +131,7 @@ class ViewCaller {\n} else {\nfinal Class<?> argumentType = assignableArgType(proposedArgs[i].getClass());\nif (!paramType.isAssignableFrom(argumentType)) {\n+ Logger.v(\"Param type: \" + paramType.toString() + \" not assignable from arg type: \" + argumentType.toString()); // TODO remove\nreturn false;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewEdit.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewEdit.java",
"diff": "@@ -92,10 +92,12 @@ class ViewEdit {\n}\nvoid cleanup() {\n+ Logger.v(\"Cleaning up ViewEdit with path: \" + path.toString()); // TODO remove\nfor (Map.Entry<View, Object> original : originalValues.entrySet()) {\nfinal View changedView = original.getKey();\nfinal Object originalValue = original.getValue();\n- if (null != originalValue) {\n+ Logger.v(\"In cleanup trying to revert view: \" + changedView.toString() + \" to originalValue: \" + (originalValue == null ? \"NULL\" : originalValue.toString())); // TODO remove\n+ if (originalValue != null) {\noriginalValueHolder[0] = originalValue;\nmutator.invokeMethodWithArgs(changedView, originalValueHolder);\n}\n@@ -110,6 +112,7 @@ class ViewEdit {\nfinal Object targetValue = args[0];\nfinal Object currentValue = accessor.invokeMethod(targetView);\n+ Logger.v(\"Applying View Edit with target value: \" + (targetValue != null ? targetValue.toString() : \"NULL\") + \" and current value: \"+ (currentValue != null ? currentValue.toString() : \"NULL\")); // TODO remove\nif (targetValue == currentValue) {\nreturn;\n}\n@@ -137,6 +140,7 @@ class ViewEdit {\nif (mutator.argsAreApplicable(originalValueHolder)) {\noriginalValues.put(targetView, currentValue);\n} else {\n+ Logger.v(\"Unable to save original value for current value: \"+ (currentValue != null ? currentValue.toString() : \"NULL\")); // TODO remove\noriginalValues.put(targetView, null);\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | refactor variant loading |
116,623 | 25.07.2019 20:54:06 | -19,080 | 0612fc90d815bcc5812c508be7e7a4f87d0fbd19 | Fixed clearing of textColor and Image change_request | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ImageCache.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ImageCache.java",
"diff": "@@ -206,10 +206,11 @@ public class ImageCache {\nprivate static Bitmap decodeImageFromFile(File file) {\nBitmapFactory.Options options = new BitmapFactory.Options();\n- options.inJustDecodeBounds = true;\n+ options.inJustDecodeBounds = false;\nBitmapFactory.decodeFile(file.getAbsolutePath(), options);\nfloat imageSize = (float) options.outHeight * options.outWidth * 4;\n- if (imageSize > getAvailableMemory()) {\n+ float imageSizeKb = imageSize/1024;\n+ if (imageSizeKb > getAvailableMemory()) {\nLogger.v( \"CleverTap.ImageCache: image too large to decode\");\nreturn null;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -138,11 +138,6 @@ public class CTABTestController {\nswitch (type) {\ncase MESSAGE_TYPE_CHANGE_REQUEST:\nmessageCode = ExecutionThreadHandler.MESSAGE_HANDLE_EDITOR_CHANGES_RECEIVED;\n-// try {\n-// msg = new JSONObject(\"{\\\"type\\\":\\\"change_request\\\",\\\"data\\\":{\\\"actions\\\":[{\\\"args\\\":[[4287903743,\\\"android.graphics.drawable.ColorDrawable\\\"]],\\\"name\\\":\\\"c1361\\\",\\\"path\\\":[{\\\"prefix\\\":\\\"shortest\\\",\\\"index\\\":0,\\\"id\\\":16908290},{\\\"view_class\\\":\\\"android.widget.LinearLayout\\\",\\\"index\\\":0},{\\\"view_class\\\":\\\"android.widget.Button\\\",\\\"index\\\":1}],\\\"property\\\":{\\\"name\\\":\\\"background\\\",\\\"get\\\":{\\\"selector\\\":\\\"getBackground\\\",\\\"parameters\\\":[],\\\"result\\\":{\\\"type\\\":\\\"android.graphics.drawable.Drawable\\\"}},\\\"set\\\":{\\\"selector\\\":\\\"setBackground\\\",\\\"parameters\\\":[{\\\"type\\\":\\\"android.graphics.drawable.ColorDrawable\\\"}]},\\\"classname\\\":\\\"android.view.View\\\"},\\\"change_type\\\":\\\"property\\\"}]}}\");//TODO remove this after test\n-// } catch (JSONException e) {\n-// e.printStackTrace();\n-// }\nbreak;\ncase MESSAGE_TYPE_CLEAR_REQUEST:\nmessageCode = ExecutionThreadHandler.MESSAGE_HANDLE_EDITOR_CHANGES_CLEARED;\n@@ -598,8 +593,8 @@ public class CTABTestController {\n}\nfinal String protocol = \"wss\";\n- final String dashboardDomain = /*@\"dashboard.clevertap.com\"*/ \"aa931949.ngrok.io\"; // TODO put final production dashboard link\n- //final String dashboardDomain = \"eu1-dashboard-staging-2.dashboard.clevertap.com\"; //Staging link\n+ //final String dashboardDomain = /*@\"dashboard.clevertap.com\"*/ \"f43cc14f.ngrok.io\"; // TODO put final production dashboard link\n+ final String dashboardDomain = \"eu1-dashboard-staging-2.dashboard.clevertap.com\"; //Staging link\nfinal String domain = config.getAccountRegion() != null ? config.getAccountRegion()+\".\"+dashboardDomain : dashboardDomain;\nfinal String url = protocol+\"://\"+domain+\"/\"+getAccountId()+\"/\"+\"websocket/screenab/sdk?tk=\"+config.getAccountToken();\ngetConfigLogger().verbose(getAccountId(), \"Websocket URL - \" + url);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewCaller.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewCaller.java",
"diff": "@@ -110,14 +110,12 @@ class ViewCaller {\nboolean argsAreApplicable(Object[] proposedArgs) {\nfinal Class<?>[] paramTypes = targetMethod.getParameterTypes();\nif (proposedArgs.length != paramTypes.length) {\n- Logger.v(\"Args not applicable: incorrect args length: \" + proposedArgs.length + \" relative to paramtypes length: \" + paramTypes.length); // TODO remove\nreturn false;\n}\nfor (int i = 0; i < proposedArgs.length; i++) {\nfinal Class<?> paramType = assignableArgType(paramTypes[i]);\nif (proposedArgs[i] == null) {\n- Logger.v(\"Args not applicable: proposed args is null\"); // TODO remove\nif (paramType == byte.class ||\nparamType == short.class ||\nparamType == int.class ||\n@@ -130,8 +128,9 @@ class ViewCaller {\n}\n} else {\nfinal Class<?> argumentType = assignableArgType(proposedArgs[i].getClass());\n- if (!paramType.isAssignableFrom(argumentType)) {\n- Logger.v(\"Param type: \" + paramType.toString() + \" not assignable from arg type: \" + argumentType.toString()); // TODO remove\n+ if(argumentType.getCanonicalName() != null && argumentType.getCanonicalName().equals(\"android.content.res.ColorStateList\")){\n+ //no-op to skip\n+ }else if (!paramType.isAssignableFrom(argumentType)) {\nreturn false;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewEdit.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewEdit.java",
"diff": "package com.clevertap.android.sdk.ab_testing.uieditor;\n+import android.content.res.ColorStateList;\nimport android.graphics.Bitmap;\nimport android.graphics.drawable.BitmapDrawable;\nimport android.support.annotation.NonNull;\n@@ -92,13 +93,15 @@ class ViewEdit {\n}\nvoid cleanup() {\n- Logger.v(\"Cleaning up ViewEdit with path: \" + path.toString()); // TODO remove\nfor (Map.Entry<View, Object> original : originalValues.entrySet()) {\nfinal View changedView = original.getKey();\nfinal Object originalValue = original.getValue();\n- Logger.v(\"In cleanup trying to revert view: \" + changedView.toString() + \" to originalValue: \" + (originalValue == null ? \"NULL\" : originalValue.toString())); // TODO remove\nif (originalValue != null) {\n+ if(originalValue instanceof ColorStateList){\n+ originalValueHolder[0] = ((ColorStateList) originalValue).getDefaultColor();\n+ }else {\noriginalValueHolder[0] = originalValue;\n+ }\nmutator.invokeMethodWithArgs(changedView, originalValueHolder);\n}\n}\n@@ -112,7 +115,6 @@ class ViewEdit {\nfinal Object targetValue = args[0];\nfinal Object currentValue = accessor.invokeMethod(targetView);\n- Logger.v(\"Applying View Edit with target value: \" + (targetValue != null ? targetValue.toString() : \"NULL\") + \" and current value: \"+ (currentValue != null ? currentValue.toString() : \"NULL\")); // TODO remove\nif (targetValue == currentValue) {\nreturn;\n}\n@@ -140,7 +142,6 @@ class ViewEdit {\nif (mutator.argsAreApplicable(originalValueHolder)) {\noriginalValues.put(targetView, currentValue);\n} else {\n- Logger.v(\"Unable to save original value for current value: \"+ (currentValue != null ? currentValue.toString() : \"NULL\")); // TODO remove\noriginalValues.put(targetView, null);\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fixed clearing of textColor and Image change_request |
116,614 | 26.07.2019 13:47:19 | 25,200 | bef77feb61aa439ef2e489fed7a43dddd8d9d48d | disable uieditor connection by default | [
{
"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": "@@ -6745,14 +6745,15 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//ABTesting\n- private static boolean isUIEditorEnabled = true;\n+ private static boolean isUIEditorEnabled = false;\n/**\n* Disables/Enables the ability to do UI Edits from the CleverTap Dashboard\n- * Enabled by default\n+ * Disabled by default\n+ *\n*/\n@SuppressWarnings(\"unused\")\n- public static void setUIEditorEnabled(boolean enabled) {\n+ public static void setUIEditorConnectionEnabled(boolean enabled) {\nisUIEditorEnabled = enabled;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -188,7 +188,7 @@ public class CTABTestController {\npublic CTABTestController(Context context, CleverTapInstanceConfig config, String guid, CTABTestListener listener) {\nthis.varCache = new CTVarCache();\n- this.enableEditor = config.isUIEditorEnabled();\n+ this.enableEditor = config.isUIEditorEnabled(); // TODO test this\nthis.config = config;\nthis.guid = guid;\nthis.setListener(listener);\n@@ -204,7 +204,7 @@ public class CTABTestController {\nfinal Application app = (Application) context.getApplicationContext();\napp.registerActivityLifecycleCallbacks(new LifecycleCallbacks());\n} else {\n- config.getLogger().debug(config.getAccountId(), \"UIEditor is disabled\");\n+ config.getLogger().debug(config.getAccountId(), \"UIEditor connection is disabled\");\n}\napplyStoredExperiments();\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | disable uieditor connection by default |
116,623 | 30.07.2019 15:19:07 | -19,080 | 08e4eac62c63501da8ea7209cc7481941e411ceb | Fixing clear_request for background color changes and JSON parsing of ab_exps | [
{
"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": "@@ -2438,7 +2438,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//Handle ABTesting response\nif(!getConfig().isAnalyticsOnly()){\ntry{\n- if(response.has(\"abtest\")){\n+ if(response.has(\"ab_exps\")){\ngetConfigLogger().verbose(getAccountId(), \"Processing ABTest experiments...\");\nprocessIncomingExperiments(response);\n}\n@@ -7131,9 +7131,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n- private void processIncomingExperiments(JSONObject experiments){\n+ private void processIncomingExperiments(JSONObject response){\ntry {\n- JSONArray experimentsArray = experiments.getJSONArray(\"ab_exp\");\n+ JSONArray experimentsArray = response.getJSONArray(\"ab_exps\");\nif (this.ctABTestController != null) {\nctABTestController.updateExperiments(experimentsArray);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -933,6 +933,7 @@ public class CTABTestController {\n}\nprivate void handleDashboardDisconnect() {\n+ stopVariants();\ncloseConnection();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/models/CTABVariant.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/models/CTABVariant.java",
"diff": "@@ -49,9 +49,9 @@ public class CTABVariant {\npublic static CTABVariant initWithJSON(JSONObject json) {\ntry {\n- String experimentId = json.optString(\"experiment_id\", \"0\");\n- String variantId = json.optString(\"id\", \"0\");\n- int version = json.optInt(\"variant_version\", 0);\n+ String experimentId = json.optString(\"exp_id\", \"0\");\n+ String variantId = json.optString(\"var_id\", \"0\");\n+ int version = json.optInt(\"version\", 0);\nfinal JSONArray actions = json.optJSONArray(\"actions\");\nfinal JSONArray vars = json.optJSONArray(\"vars\");\nCTABVariant variant = new CTABVariant(experimentId, variantId, version, actions, vars);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewCaller.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewCaller.java",
"diff": "@@ -128,7 +128,10 @@ class ViewCaller {\n}\n} else {\nfinal Class<?> argumentType = assignableArgType(proposedArgs[i].getClass());\n- if(argumentType.getCanonicalName() != null && argumentType.getCanonicalName().equals(\"android.content.res.ColorStateList\")){\n+ if(argumentType.getCanonicalName() != null\n+ && (argumentType.getCanonicalName().equals(\"android.content.res.ColorStateList\")\n+ || argumentType.getCanonicalName().equals(\"android.graphics.drawable.ColorDrawable\")\n+ || argumentType.getCanonicalName().equals(\"android.graphics.drawable.RippleDrawable\"))){\n//no-op to skip\n}else if (!paramType.isAssignableFrom(argumentType)) {\nreturn false;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewEdit.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewEdit.java",
"diff": "@@ -3,6 +3,7 @@ package com.clevertap.android.sdk.ab_testing.uieditor;\nimport android.content.res.ColorStateList;\nimport android.graphics.Bitmap;\nimport android.graphics.drawable.BitmapDrawable;\n+import android.graphics.drawable.Drawable;\nimport android.support.annotation.NonNull;\nimport android.view.View;\nimport android.view.ViewGroup;\n@@ -16,6 +17,7 @@ import java.util.List;\nimport java.util.Map;\nimport java.util.WeakHashMap;\n+@SuppressWarnings(\"SuspiciousMethodCalls\")\nclass ViewEdit {\nstatic class PathElement {\n@@ -72,7 +74,7 @@ class ViewEdit {\nprivate final Pathfinder pathFinder;\nprivate final ViewCaller mutator;\nprivate final ViewCaller accessor;\n- private final WeakHashMap<View, Object> originalValues;\n+ private static final WeakHashMap<View, Object> originalValues = new WeakHashMap<>();\nprivate final Object[] originalValueHolder;\nViewEdit(List<PathElement> path, ViewCaller mutator, ViewCaller accessor) {\n@@ -81,7 +83,6 @@ class ViewEdit {\nthis.mutator = mutator;\nthis.accessor = accessor;\noriginalValueHolder = new Object[1];\n- originalValues = new WeakHashMap<>();\n}\nprotected List<PathElement> getPath() {\n@@ -99,12 +100,15 @@ class ViewEdit {\nif (originalValue != null) {\nif (originalValue instanceof ColorStateList) {\noriginalValueHolder[0] = ((ColorStateList) originalValue).getDefaultColor();\n+ } else if(originalValue instanceof Drawable){\n+ originalValueHolder[0] = ((Drawable) originalValue).getCurrent();\n} else {\noriginalValueHolder[0] = originalValue;\n}\nmutator.invokeMethodWithArgs(changedView, originalValueHolder);\n}\n}\n+\n}\n@SuppressWarnings(\"StatementWithEmptyBody\")\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fixing clear_request for background color changes and JSON parsing of ab_exps |
116,623 | 30.07.2019 15:40:33 | -19,080 | ccb326e2829ef23ef1d79fd05a36d5b69020c3c8 | Disconnect from dashboard when app goes in background | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -186,9 +186,13 @@ public class CTABTestController {\nexecutionThreadHandler.sendMessage(executionThreadHandler.obtainMessage(ExecutionThreadHandler.MESSAGE_INITIALIZE_EXPERIMENTS));\n}\n+ private void disconnectOnBackground() {\n+ executionThreadHandler.sendMessage(executionThreadHandler.obtainMessage(ExecutionThreadHandler.MESSAGE_HANDLE_DISCONNECT));\n+ }\n+\npublic CTABTestController(Context context, CleverTapInstanceConfig config, String guid, CTABTestListener listener) {\nthis.varCache = new CTVarCache();\n- this.enableEditor = config.isUIEditorEnabled(); // TODO test this\n+ this.enableEditor = config.isUIEditorEnabled();\nthis.config = config;\nthis.guid = guid;\nthis.setListener(listener);\n@@ -1083,6 +1087,7 @@ public class CTABTestController {\npublic void onActivityPaused(Activity activity) {\nuiEditor.removeActivity(activity);\nderegisterConnectionTrigger(activity);\n+ disconnectOnBackground();\n}\n@Override\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Disconnect from dashboard when app goes in background |
116,623 | 30.07.2019 20:29:23 | -19,080 | 625cb589fd52210af04a68dce7406cc7f65c2eb4 | Adding SDK validation for Vars | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -915,6 +915,7 @@ public class CTABTestController {\nreturn;\n}\napplyVars(vars);\n+ notifyExperimentsUpdated();\n} catch (Throwable t) {\ngetConfigLogger().debug(getAccountId(),\"Unable to handle dashboard Vars received - \"+t);\n}\n@@ -923,7 +924,7 @@ public class CTABTestController {\nprivate void applyVars(JSONArray vars) {\ntry {\nfor (int i=0;i<vars.length();i++) {\n- JSONObject var = (JSONObject) vars.get(i);\n+ JSONObject var = vars.getJSONObject(i);\n_registerVar(var.getString(\"name\"), CTVar.CTVarType.fromString(var.getString(\"type\")), var.get(\"value\"));\n}\n} catch (Throwable t) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTVar.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTVar.java",
"diff": "package com.clevertap.android.sdk.ab_testing;\nimport android.support.annotation.NonNull;\n-\n+import com.clevertap.android.sdk.Logger;\nimport org.json.JSONObject;\n-\n+import java.util.Arrays;\n+import java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\n@@ -97,22 +98,111 @@ final class CTVar {\nif (_value == null) {\nreturn;\n}\n- if (_value instanceof String) {\n- _stringValue = (String) _value;\n- try {\n- _numberValue = Double.valueOf(_stringValue);\n- } catch (NumberFormatException e) {\n- _numberValue = null;\n+\n+ switch (type){\n+ case CTVarTypeBool:\n+ _stringValue = _value.toString();\n+ break;\n+ case CTVarTypeDouble:\n+ _numberValue = Double.valueOf(_value.toString());\n+ break;\n+ case CTVarTypeInteger:\n+ _numberValue = Double.valueOf(_value.toString());\n+ break;\n+ case CTVarTypeString:\n+ _stringValue = _value.toString();\n+ break;\n+ case CTVarTypeListOfBool:\n+ case CTVarTypeListOfDouble:\n+ case CTVarTypeListOfInteger:\n+ case CTVarTypeListOfString:\n+ _listValue = validateValueArray(_value);\n+ break;\n+ case CTVarTypeMapOfBool:\n+ case CTVarTypeMapOfDouble:\n+ case CTVarTypeMapOfInteger:\n+ case CTVarTypeMapOfString:\n+ _mapValue = validateValueMap(_value);\n+ break;\n+ case CTVarTypeUnknown:\n+ break;\n+ }\n}\n- } else if (_value instanceof Number) {\n- _stringValue = \"\" + _value;\n- _numberValue = ((Number) _value).doubleValue();\n- } else if (_value instanceof List<?>) {\n- _listValue = (List<?>) _value;\n- } else if (_value instanceof Map<?, ?>) {\n- _mapValue = (Map<?, ?>) _value;\n+ private Map<?,?> validateValueMap(Object _value){\n+ String stringValue = _value.toString();\n+ stringValue = stringValue.replace(\"\\\"\",\"\");\n+ stringValue = stringValue.replace(\"{\",\"\");\n+ stringValue = stringValue.replace(\"}\",\"\");\n+\n+ Object[] objectArray = stringValue.split(\",\");\n+\n+ Map<Object,Object> objectMap = new HashMap<>();\n+\n+ for(Object o : objectArray){\n+ Object[] objectValuesArray = o.toString().split(\":\");\n+ switch (type) {\n+ case CTVarTypeListOfString:\n+ if (!(objectValuesArray[1] instanceof String)) {\n+ Logger.d(\"Failed to parse the array value, invalid value provided : \" + o.toString());\n+ return null;\n+ }\n+ break;\n+ case CTVarTypeListOfDouble:\n+ case CTVarTypeListOfInteger:\n+ if (!(objectValuesArray[1] instanceof Number)) {\n+ Logger.d(\"Failed to parse the array value, invalid value provided : \" + o.toString());\n+ return null;\n+ }\n+ break;\n+ case CTVarTypeListOfBool:\n+ if(!(objectValuesArray[1] instanceof Boolean)){\n+ Logger.d(\"Failed to parse the array value, invalid value provided : \"+o.toString());\n+ return null;\n+ }\n+ break;\n}\n+ objectMap.put(objectValuesArray[0],objectValuesArray[1]);\n+ }\n+\n+ return objectMap;\n+\n+ }\n+\n+ private List<?> validateValueArray(Object _value){\n+ //TODO Example - If integerArray is passed from dashboard _value comes as [1,2,3].\n+ //TODO to remove the solid brackets I have to convert to String but then validation fails\n+ //TODO need to send array Vars in a better format. This happens for all data types except String\n+ String stringValue = _value.toString();\n+ stringValue = stringValue.replace(\"[\",\"\");\n+ stringValue = stringValue.replace(\"]\",\"\");\n+ Object[] objectArray = stringValue.split(\",\");\n+\n+ for (Object o : objectArray) {\n+ switch (type) {\n+ case CTVarTypeListOfString:\n+ if (!(o instanceof String)) {\n+ Logger.d(\"Failed to parse the array value, invalid value provided : \" + o.toString());\n+ return null;\n+ }\n+ break;\n+ case CTVarTypeListOfDouble:\n+ case CTVarTypeListOfInteger:\n+ if (!(o instanceof Number)) {\n+ Logger.d(\"Failed to parse the array value, invalid value provided : \" + o.toString());\n+ return null;\n+ }\n+ break;\n+ case CTVarTypeListOfBool:\n+ if(!(o instanceof Boolean)){\n+ Logger.d(\"Failed to parse the array value, invalid value provided : \"+o.toString());\n+ return null;\n+ }\n+ break;\n+ }\n+ }\n+ return Arrays.asList(objectArray);\n+\n}\nCTVar(String name, CTVarType type, Object value) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Adding SDK validation for Vars |
116,614 | 30.07.2019 17:36:15 | 25,200 | 985726dbe6c5b520ee034a73e7a878f87793bbff | refactor vars parsing | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTVar.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTVar.java",
"diff": "@@ -3,6 +3,8 @@ package com.clevertap.android.sdk.ab_testing;\nimport android.support.annotation.NonNull;\nimport com.clevertap.android.sdk.Logger;\nimport org.json.JSONObject;\n+\n+import java.util.ArrayList;\nimport java.util.Arrays;\nimport java.util.HashMap;\nimport java.util.List;\n@@ -99,110 +101,110 @@ final class CTVar {\nreturn;\n}\n- switch (type){\n- case CTVarTypeBool:\n- _stringValue = _value.toString();\n- break;\n- case CTVarTypeDouble:\n- _numberValue = Double.valueOf(_value.toString());\n- break;\n- case CTVarTypeInteger:\n- _numberValue = Double.valueOf(_value.toString());\n- break;\n- case CTVarTypeString:\n+ if (_value instanceof String) {\n+ _stringValue = (String) _value;\n+ try {\n+ _numberValue = Double.valueOf(_stringValue);\n+ } catch (Throwable t) {\n+ // no-op\n+ }\n+ } else if (_value instanceof Number) {\n+ _stringValue = \"\" + _value;\n+ _numberValue = ((Number) _value).doubleValue();\n+ } else {\n+ try {\n_stringValue = _value.toString();\n- break;\n+ } catch (Throwable t) {\n+ Logger.d(\"Error parsing var\", t);\n+ return;\n+ }\n+ }\n+\n+ switch (type){\ncase CTVarTypeListOfBool:\ncase CTVarTypeListOfDouble:\ncase CTVarTypeListOfInteger:\ncase CTVarTypeListOfString:\n- _listValue = validateValueArray(_value);\n+ _listValue = listFromString(_stringValue, type);\nbreak;\ncase CTVarTypeMapOfBool:\ncase CTVarTypeMapOfDouble:\ncase CTVarTypeMapOfInteger:\ncase CTVarTypeMapOfString:\n- _mapValue = validateValueMap(_value);\n- break;\n- case CTVarTypeUnknown:\n+ _mapValue = mapFromString(_stringValue, type);\nbreak;\n}\n}\n- private Map<?,?> validateValueMap(Object _value){\n- String stringValue = _value.toString();\n- stringValue = stringValue.replace(\"\\\"\",\"\");\n- stringValue = stringValue.replace(\"{\",\"\");\n- stringValue = stringValue.replace(\"}\",\"\");\n-\n- Object[] objectArray = stringValue.split(\",\");\n+ private Map<String, ?> mapFromString(String stringValue, CTVarType type) {\n+ try {\n+ String[] stringArray = stringValue.replace(\"\\\"\",\"\")\n+ .replace(\"{\",\"\")\n+ .replace(\"}\",\"\")\n+ .split(\",\"); // [\"key:value\", \"key:value\"...]\n- Map<Object,Object> objectMap = new HashMap<>();\n+ Map<String, Object> objectMap = new HashMap<>();\n- for(Object o : objectArray){\n- Object[] objectValuesArray = o.toString().split(\":\");\n+ for(String s : stringArray){\n+ String [] stringValuesArray = s.split(\":\");\n+ String key = stringValuesArray[0];\n+ String _stringValue = stringValuesArray[1];\n+ Object value = null;\nswitch (type) {\n- case CTVarTypeListOfString:\n- if (!(objectValuesArray[1] instanceof String)) {\n- Logger.d(\"Failed to parse the array value, invalid value provided : \" + o.toString());\n- return null;\n- }\n+ case CTVarTypeMapOfBool:\n+ value = Boolean.valueOf(_stringValue);\nbreak;\n- case CTVarTypeListOfDouble:\n- case CTVarTypeListOfInteger:\n- if (!(objectValuesArray[1] instanceof Number)) {\n- Logger.d(\"Failed to parse the array value, invalid value provided : \" + o.toString());\n- return null;\n- }\n+ case CTVarTypeMapOfDouble:\n+ value = Double.valueOf(_stringValue);\nbreak;\n- case CTVarTypeListOfBool:\n- if(!(objectValuesArray[1] instanceof Boolean)){\n- Logger.d(\"Failed to parse the array value, invalid value provided : \"+o.toString());\n- return null;\n- }\n+ case CTVarTypeMapOfInteger:\n+ value = Integer.valueOf(_stringValue);\n+ break;\n+ case CTVarTypeMapOfString:\n+ value = _stringValue;\nbreak;\n}\n- objectMap.put(objectValuesArray[0],objectValuesArray[1]);\n+ if (value != null) {\n+ objectMap.put(key, value);\n+ }\n}\n-\nreturn objectMap;\n+ } catch (Throwable t) {\n+ Logger.d(\"Unable to parse map of type: \" + type.toString() + \" from : \" + stringValue);\n+ return null;\n+ }\n+ }\n+\n+ private List<?> listFromString(String stringValue, CTVarType type) {\n+ try {\n+ String[] stringArray = stringValue.replace(\"[\",\"\")\n+ .replace(\"]\",\"\")\n+ .split(\",\"); // [\"value\", \"value\"...]\n+ if (type == CTVarType.CTVarTypeListOfString) {\n+ return Arrays.asList(stringArray);\n}\n- private List<?> validateValueArray(Object _value){\n- //TODO Example - If integerArray is passed from dashboard _value comes as [1,2,3].\n- //TODO to remove the solid brackets I have to convert to String but then validation fails\n- //TODO need to send array Vars in a better format. This happens for all data types except String\n- String stringValue = _value.toString();\n- stringValue = stringValue.replace(\"[\",\"\");\n- stringValue = stringValue.replace(\"]\",\"\");\n- Object[] objectArray = stringValue.split(\",\");\n+ ArrayList<Object> parsed = new ArrayList<>();\n- for (Object o : objectArray) {\n+ for (String s : stringArray) {\nswitch (type) {\n- case CTVarTypeListOfString:\n- if (!(o instanceof String)) {\n- Logger.d(\"Failed to parse the array value, invalid value provided : \" + o.toString());\n- return null;\n- }\n+ case CTVarTypeListOfBool:\n+ parsed.add(Boolean.valueOf(s));\nbreak;\ncase CTVarTypeListOfDouble:\n+ parsed.add(Double.valueOf(s));\n+ break;\ncase CTVarTypeListOfInteger:\n- if (!(o instanceof Number)) {\n- Logger.d(\"Failed to parse the array value, invalid value provided : \" + o.toString());\n- return null;\n- }\n+ parsed.add(Integer.valueOf(s));\nbreak;\n- case CTVarTypeListOfBool:\n- if(!(o instanceof Boolean)){\n- Logger.d(\"Failed to parse the array value, invalid value provided : \"+o.toString());\n- return null;\n}\n- break;\n}\n+ return parsed;\n+ } catch (Throwable t) {\n+ Logger.d(\"Unable to parse list of type: \" + type.toString() + \" from : \" + stringValue);\n+ return null;\n}\n- return Arrays.asList(objectArray);\n-\n}\nCTVar(String name, CTVarType type, Object value) {\n@@ -236,14 +238,22 @@ final class CTVar {\nif (_stringValue == null) {\nreturn null;\n}\n+ try {\nreturn Boolean.valueOf(_stringValue);\n+ } catch (Throwable t) {\n+ return null;\n+ }\n}\nInteger integerValue() {\nif (_numberValue == null) {\nreturn null;\n}\n+ try {\nreturn _numberValue.intValue();\n+ } catch (Throwable t) {\n+ return null;\n+ }\n}\nDouble doubleValue() {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | refactor vars parsing |
116,623 | 02.08.2019 10:55:34 | -19,080 | 860364547ab61657b45e94cad65cb0bee95e0164 | Fixed background color clear and sending library in handshake | [
{
"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": "@@ -7180,7 +7180,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ndeviceInfo.put(\"dpi\", String.valueOf(this.deviceInfo.getDPI()));\ndeviceInfo.put(\"device_width\", String.valueOf(this.deviceInfo.getWidthPixels()));\ndeviceInfo.put(\"device_height\", String.valueOf(this.deviceInfo.getHeightPixels()));\n+ if(this.deviceInfo.getLibrary() != null) {\ndeviceInfo.put(\"library\", this.deviceInfo.getLibrary());\n+ }\nreturn deviceInfo;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -757,7 +757,7 @@ public class CTABTestController {\ndata.put(\"id\", guid);\ndata.put(\"os\", deviceInfo.getString(\"osName\"));\ndata.put(\"name\", deviceInfo.getString(\"model\"));\n- if(deviceInfo.getString(\"library\") != null){\n+ if(deviceInfo.has(\"library\")){\ndata.put(\"library\",deviceInfo.getString(\"library\"));\n}\nJSONObject payload = new JSONObject();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewCaller.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewCaller.java",
"diff": "@@ -129,7 +129,9 @@ class ViewCaller {\n} else {\nfinal Class<?> argumentType = assignableArgType(proposedArgs[i].getClass());\nif(argumentType.getCanonicalName() != null\n- && (argumentType.getCanonicalName().equals(\"android.content.res.ColorStateList\"))){\n+ && (argumentType.getCanonicalName().equals(\"android.content.res.ColorStateList\") ||\n+ argumentType.getCanonicalName().equals(\"android.graphics.drawable.ColorDrawable\") ||\n+ argumentType.getCanonicalName().equals(\"android.graphics.drawable.RippleDrawable\"))){\n//no-op to skip\n}else if (!paramType.isAssignableFrom(argumentType)) {\nreturn false;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewEdit.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewEdit.java",
"diff": "@@ -3,7 +3,6 @@ package com.clevertap.android.sdk.ab_testing.uieditor;\nimport android.content.res.ColorStateList;\nimport android.graphics.Bitmap;\nimport android.graphics.drawable.BitmapDrawable;\n-import android.graphics.drawable.Drawable;\nimport android.support.annotation.NonNull;\nimport android.view.View;\nimport android.view.ViewGroup;\n@@ -101,8 +100,6 @@ class ViewEdit {\nif (originalValue != null) {\nif (originalValue instanceof ColorStateList) {\noriginalValueHolder[0] = ((ColorStateList) originalValue).getDefaultColor();\n- } else if (originalValue instanceof Drawable) {\n- originalValueHolder[0] = ((Drawable) originalValue).getCurrent();\n} else {\noriginalValueHolder[0] = originalValue;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fixed background color clear and sending library in handshake |
116,623 | 07.08.2019 18:11:11 | -19,080 | 21df2f968580126af008c4011fce7254b0821972 | Deeplink invocation in InApps with query params as Bundle. Enhancement for issue | [
{
"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": "@@ -11,6 +11,7 @@ import android.util.TypedValue;\nimport android.view.View;\nimport java.lang.ref.WeakReference;\n+import java.util.Set;\nimport java.util.concurrent.atomic.AtomicBoolean;\npublic abstract class CTInAppBaseFragment extends Fragment {\n@@ -92,7 +93,18 @@ public abstract class CTInAppBaseFragment extends Fragment {\nvoid fireUrlThroughIntent(String url, Bundle formData) {\ntry {\n- Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));\n+ Uri uri = Uri.parse(url);\n+ Set<String> queryParamSet = uri.getQueryParameterNames();\n+ Bundle queryBundle = new Bundle();\n+ if(queryParamSet != null && !queryParamSet.isEmpty()){\n+ for(String queryName : queryParamSet){\n+ queryBundle.putString(queryName,uri.getQueryParameter(queryName));\n+ }\n+ }\n+ Intent intent = new Intent(Intent.ACTION_VIEW, uri);\n+ if(!queryBundle.isEmpty()){\n+ intent.putExtras(queryBundle);\n+ }\nstartActivity(intent);\n} catch (Throwable t) {\n// Ignore\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Deeplink invocation in InApps with query params as Bundle. Enhancement for issue #20 |
116,623 | 08.08.2019 14:07:41 | -19,080 | 2366666ea4f69c3b4e9d9d3c1295fc6d6854fa05 | Fix for font size not reverting on clear_request | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"diff": "@@ -377,7 +377,7 @@ public class UIEditor {\ngetConfigLogger().verbose(\"UIEditor: UI change unable to create mutator: \" + data.toString());\nreturn null;\n}\n- viewEdit = new ViewEdit(path, mutator, prop.accessor);\n+ viewEdit = new ViewEdit(path, mutator, prop.accessor,context);\n} else {\ngetConfigLogger().verbose(\"UIEditor: UI change type is unknown: \" + data.toString());\nreturn null;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewCaller.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewCaller.java",
"diff": "@@ -26,6 +26,10 @@ class ViewCaller {\nthis.targetClass = targetMethod.getDeclaringClass();\n}\n+ String getMethodName() {\n+ return methodName;\n+ }\n+\nObject invokeMethod(View target) {\nreturn invokeMethodWithArgs(target, methodArgs);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewEdit.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewEdit.java",
"diff": "package com.clevertap.android.sdk.ab_testing.uieditor;\n+import android.content.Context;\nimport android.content.res.ColorStateList;\nimport android.graphics.Bitmap;\nimport android.graphics.drawable.BitmapDrawable;\n@@ -75,14 +76,16 @@ class ViewEdit {\nprivate final ViewCaller accessor;\nprivate final WeakHashMap<View, Object> originalValues;\nprivate final Object[] originalValueHolder;\n+ private Context context;\n- ViewEdit(List<PathElement> path, ViewCaller mutator, ViewCaller accessor) {\n+ ViewEdit(List<PathElement> path, ViewCaller mutator, ViewCaller accessor, Context context) {\nthis.path = path;\npathFinder = new Pathfinder();\nthis.mutator = mutator;\nthis.accessor = accessor;\noriginalValueHolder = new Object[1];\noriginalValues = new WeakHashMap<>();\n+ this.context = context;\n}\nprotected List<PathElement> getPath() {\n@@ -114,11 +117,16 @@ class ViewEdit {\nfinal Object[] args = mutator.getArgs();\nif (args.length == 1) {\nfinal Object targetValue = args[0];\n- final Object currentValue = accessor.invokeMethod(targetView);\n+ Object currentValue = accessor.invokeMethod(targetView);\n+\n+ if(accessor.getMethodName().equals(\"getTextSize\")){\n+ currentValue = (float)currentValue / context.getResources().getDisplayMetrics().scaledDensity;\n+ }\nif (targetValue == currentValue) {\nreturn;\n}\n+\nif (targetValue != null) {\nif (targetValue instanceof Bitmap && currentValue instanceof Bitmap) {\nfinal Bitmap targetBitmap = (Bitmap) targetValue;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fix for font size not reverting on clear_request |
116,623 | 08.08.2019 16:46:41 | -19,080 | 470b2b78b006a1ec0c17b6d45cdbe0eddc898855 | Bug fix - Image only templates will not render without media now | [
{
"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": "@@ -212,11 +212,15 @@ class CTInAppNotification implements Parcelable {\ncase CTInAppTypeCoverImageOnly:\ncase CTInAppTypeHalfInterstitialImageOnly:\ncase CTInAppTypeInterstitialImageOnly:\n+ if(!this.mediaList.isEmpty()) {\nfor (CTInAppNotificationMedia inAppMedia : this.mediaList) {\nif (inAppMedia.isGIF() || inAppMedia.isAudio() || inAppMedia.isVideo() || !inAppMedia.isImage()) {\nthis.error = \"Wrong media type for template\";\n}\n}\n+ }else{\n+ this.error = \"No media type for template\";\n+ }\nbreak;\n}\n}catch (JSONException e){\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Bug fix - Image only templates will not render without media now |
116,623 | 13.08.2019 11:49:58 | -19,080 | 626114623752d3473362a21f5353847d8127bb65 | Bug fix for handling CTA PN dismiss without CTNotificationIntentService | [
{
"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": "@@ -18,7 +18,10 @@ import android.content.ContentResolver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.SharedPreferences;\n+import android.content.pm.PackageInfo;\nimport android.content.pm.PackageManager;\n+import android.content.pm.ResolveInfo;\n+import android.content.pm.ServiceInfo;\nimport android.graphics.Bitmap;\nimport android.graphics.Color;\nimport android.location.Location;\n@@ -5563,8 +5566,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n- boolean isCTIntentServiceAvailable = isServiceAvailable(context,\n- CTNotificationIntentService.MAIN_ACTION, CTNotificationIntentService.class);\n+ boolean isCTIntentServiceAvailable = isServiceAvailable(context, CTNotificationIntentService.class);\nif (actions != null && actions.length() > 0) {\nfor (int i = 0; i < actions.length(); i++) {\n@@ -5656,16 +5658,23 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n@SuppressWarnings(\"SameParameterValue\")\n- private static boolean isServiceAvailable(Context context, String action, Class clazz) {\n- final PackageManager packageManager = context.getPackageManager();\n- final Intent intent = new Intent(action);\n- List resolveInfo =\n- packageManager.queryIntentServices(intent, 0);\n- if (resolveInfo.size() > 0) {\n- Logger.v(\"\" + clazz.getName() + \" is available\");\n+ private static boolean isServiceAvailable(Context context, Class clazz) {\n+ PackageManager pm = context.getPackageManager();\n+ String packageName = context.getPackageName();\n+\n+ PackageInfo packageInfo;\n+ try {\n+ packageInfo = pm.getPackageInfo(packageName, PackageManager.GET_SERVICES);\n+ ServiceInfo[] services = packageInfo.services;\n+ for (ServiceInfo serviceInfo : services) {\n+ if (serviceInfo.name.equals(clazz.getName())) {\n+ Logger.v(\"Service \"+serviceInfo.name+\" found\");\nreturn true;\n}\n- Logger.v(\"\" + clazz.getName() + \" is NOT available\");\n+ }\n+ } catch (PackageManager.NameNotFoundException e) {\n+ Logger.d(\"Intent Service name not found exception - \"+e.getLocalizedMessage());\n+ }\nreturn false;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Bug fix for handling CTA PN dismiss without CTNotificationIntentService |
116,623 | 14.08.2019 10:22:07 | -19,080 | c572698c83927b35eb28c965309ed4ecb4cb3cc3 | Added a LIFO stucture to handle clear_requests | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -961,9 +961,13 @@ public class CTABTestController {\n@Override\npublic void onMessage(String message) {\n- getConfigLogger().verbose(getAccountId(),\"Received message from dashboard:\\n\" + message);\ntry {\nfinal JSONObject messageJson = new JSONObject(message);\n+ if(messageJson.has(\"data\")){\n+ if(messageJson.getJSONObject(\"data\").keys().hasNext()){\n+ getConfigLogger().verbose(getAccountId(),\"Received message from dashboard:\\n\" + message);\n+ }\n+ }\nif (!connectionIsValid()) {\ngetConfigLogger().verbose(getAccountId(), \"Dashboard connection is stale, dropping message: \" + message);\nreturn;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"diff": "@@ -24,8 +24,10 @@ import org.json.JSONObject;\nimport java.io.OutputStream;\nimport java.lang.ref.WeakReference;\n+import java.util.ArrayDeque;\nimport java.util.ArrayList;\nimport java.util.Collections;\n+import java.util.Deque;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.List;\n@@ -146,7 +148,7 @@ public class UIEditor {\nprivate final Handler uiThreadHandler;\nprivate final Map<String, List<ViewEdit>> newEdits;\n- private final Set<UIChangeBinding> currentEdits;\n+ private final Deque<UIChangeBinding> currentEdits;//Need a LIFO structure to reverse changes\nprivate SnapshotBuilder.ViewSnapshotConfig snapshotConfig;\n@@ -165,7 +167,7 @@ public class UIEditor {\nthis.config = config;\nuiThreadHandler = new Handler(Looper.getMainLooper());\nnewEdits = new HashMap<>();\n- currentEdits = new HashSet<>();\n+ currentEdits = new ArrayDeque<>();\nactivitySet = new ActivitySet();\neditorSessionImageUrls = new ArrayList<>();\nthis.context = context;\n@@ -282,10 +284,9 @@ public class UIEditor {\nprivate void clearEdits() {\nsynchronized (currentEdits) {\n- for (final UIChangeBinding stale : currentEdits) {\n- stale.kill();\n+ while(!currentEdits.isEmpty()){\n+ currentEdits.removeLast().kill();//removeLast() picks up the last change added to the Deque\n}\n- currentEdits.clear();\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Added a LIFO stucture to handle clear_requests |
116,623 | 14.08.2019 20:56:35 | -19,080 | c7ec383a503d1fcf03cc88ab0c336569d2e63477 | Fixing flickering of views and ensuring stored experiments don't apply on new screens when connected to Dashboard | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -621,7 +621,7 @@ public class CTABTestController {\nreturn wsClient != null && !wsClient.isClosed() && !wsClient.isClosing() && !wsClient.isFlushAndClose();\n}\n- private boolean isConnected() {\n+ boolean isConnected() {\nreturn wsClient != null && wsClient.isOpen();\n}\n@@ -1085,6 +1085,9 @@ public class CTABTestController {\npublic void onActivityResumed(Activity activity) {\nregisterConnectionTrigger(activity);\nuiEditor.addActivity(activity);\n+ if(!executionThreadHandler.isConnected()){//Will not apply stored experiments on new screens if Dashboard is connected\n+ applyStoredExperiments();\n+ }\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/models/CTABVariant.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/models/CTABVariant.java",
"diff": "@@ -119,6 +119,18 @@ public class CTABVariant {\n}\nfinal String targetActivity = Utils.optionalStringKey(change, \"target_activity\");\nfinal String name = change.getString(\"name\");\n+ boolean exists = false;\n+ CTVariantAction existingAction = null;\n+ for(CTVariantAction action: this.actions){\n+ if(action.getName().equals(name)){\n+ exists = true;\n+ existingAction = action;\n+ break;\n+ }\n+ }\n+ if(exists) {\n+ this.actions.remove(existingAction);\n+ }\nfinal CTVariantAction action = new CTVariantAction(name, targetActivity, change);\nthis.actions.add(action);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fixing flickering of views and ensuring stored experiments don't apply on new screens when connected to Dashboard |
116,623 | 14.08.2019 23:25:10 | -19,080 | 5a9ea86b32f88e000f5740bb8b338ec3b561009f | Allowing Header/Footer HTML InApps to be less than 30% in height | [
{
"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": "@@ -124,9 +124,9 @@ class CTInAppNotification implements Parcelable {\n}\nif (this.html != null) {\n- if (this.position == 't' && this.widthPercentage == 100 && this.heightPercentage == 30)\n+ if (this.position == 't' && this.widthPercentage == 100 && this.heightPercentage <= 30)\nthis.inAppType = CTInAppType.CTInAppTypeHeaderHTML;\n- else if (this.position == 'b' && this.widthPercentage == 100 && this.heightPercentage == 30)\n+ else if (this.position == 'b' && this.widthPercentage == 100 && this.heightPercentage <= 30)\nthis.inAppType = CTInAppType.CTInAppTypeFooterHTML;\nelse if (this.position == 'c' && this.widthPercentage == 90 && this.heightPercentage == 85)\nthis.inAppType = CTInAppType.CTInAppTypeInterstitialHTML;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Allowing Header/Footer HTML InApps to be less than 30% in height |
116,623 | 20.08.2019 11:55:06 | -19,080 | 29d33ec5b825d8da9b06c8e971bb7325613c9eb8 | Allowing image reversal on control variant and proper application of variants on multiple screens | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"diff": "@@ -247,7 +247,10 @@ public class UIEditor {\n}\n}\n}\n+\n+ if(isEditorSession) {\nclearEdits();\n+ }\nsynchronized(newEdits) {\nnewEdits.clear();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewEdit.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewEdit.java",
"diff": "@@ -144,9 +144,7 @@ class ViewEdit {\nreturn;\n}\n}\n- if (currentValue instanceof Bitmap || currentValue instanceof BitmapDrawable || originalValues.containsKey(targetView)) {\n- // no-op, only cache one non-image original value\n- } else {\n+ if (!originalValues.containsKey(targetView)) {\noriginalValueHolder[0] = currentValue;\nif (mutator.argsAreApplicable(originalValueHolder)) {\noriginalValues.put(targetView, currentValue);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Allowing image reversal on control variant and proper application of variants on multiple screens |
116,623 | 21.08.2019 14:00:02 | -19,080 | 37652136564d0500777ba10abaf618c2fec9d19c | Fix to re-initialize ImageCache after dashboard reconnect | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"diff": "@@ -217,6 +217,7 @@ public class UIEditor {\nfor (final String assetUrl: editorSessionImageUrls) {\nImageCache.removeBitmap(assetUrl, true);\n}\n+ imageCacheInitialized = false;\neditorSessionImageUrls.clear();\nsnapshotConfig = null;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fix to re-initialize ImageCache after dashboard reconnect |
116,623 | 23.08.2019 12:57:34 | -19,080 | 4b9b6f9abb4bddb5a7a79c846f6be9c14ef75282 | Fixed application of images during running experiments and reduced lag of application of UI changes | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -715,7 +715,7 @@ public class CTABTestController {\nreturn;\n}\n// note: experiments here will be all the currently running experiments for the user\n- try { // TODO test this updating logic\n+ try {\nSet<CTABVariant> toRemove = new HashSet<>(this.variants);\nSet<CTABVariant> allVariants = new HashSet<>(this.variants);\n@@ -730,12 +730,14 @@ public class CTABTestController {\n}\n}\n}\n+ if(!allVariants.containsAll(toRemove)) {\nif (toRemove.size() > 0) {\nfor (CTABVariant v : toRemove) {\nv.cleanup();\nallVariants.remove(v);\n}\n}\n+ }\nthis.variants = allVariants;\n} catch (JSONException e) {\ngetConfigLogger().verbose(getAccountId(), \"Error loading variants, clearing all running variants\", e);\n@@ -1085,9 +1087,6 @@ public class CTABTestController {\npublic void onActivityResumed(Activity activity) {\nregisterConnectionTrigger(activity);\nuiEditor.addActivity(activity);\n- if(!executionThreadHandler.isConnected()){//Will not apply stored experiments on new screens if Dashboard is connected\n- applyStoredExperiments();\n- }\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"diff": "@@ -155,7 +155,6 @@ public class UIEditor {\nprivate ActivitySet activitySet;\nprivate Context context;\n- private boolean imageCacheInitialized;\nprivate final ArrayList<String> editorSessionImageUrls;\npublic UIEditor(Context context, CleverTapInstanceConfig config) {\n@@ -217,7 +216,6 @@ public class UIEditor {\nfor (final String assetUrl: editorSessionImageUrls) {\nImageCache.removeBitmap(assetUrl, true);\n}\n- imageCacheInitialized = false;\neditorSessionImageUrls.clear();\nsnapshotConfig = null;\n}\n@@ -565,8 +563,6 @@ public class UIEditor {\n// only call off main thread as initWithPersistence touches the file system\nprivate void initImageCache() {\n- if (imageCacheInitialized) return;\n- imageCacheInitialized = true;\nImageCache.initWithPersistence(context);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fixed application of images during running experiments and reduced lag of application of UI changes |
116,623 | 23.08.2019 17:51:53 | -19,080 | 2a01927d4171847d0412afd19cd28f4bd45ff1bf | Removing quotes from output of List of Strings | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTVar.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTVar.java",
"diff": "@@ -178,7 +178,7 @@ final class CTVar {\nprivate List<?> listFromString(String stringValue, CTVarType type) {\ntry {\nString[] stringArray = stringValue.replace(\"[\",\"\")\n- .replace(\"]\",\"\")\n+ .replace(\"]\",\"\").replace(\"\\\"\",\"\")\n.split(\",\"); // [\"value\", \"value\"...]\nif (type == CTVarType.CTVarTypeListOfString) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Removing quotes from output of List of Strings |
116,614 | 24.08.2019 16:42:09 | 25,200 | 0ebfb20b60462c1d491e86b0de1c0c9cf5ec0db4 | add beta flag in manifest and config, enable beta connection in ab tests | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"diff": "@@ -28,6 +28,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nprivate boolean enableUIEditor;\nprivate boolean enableABTesting;\nprivate String packageName;\n+ private boolean beta;\nprivate CleverTapInstanceConfig(Context context, String accountId, String accountToken, String accountRegion, boolean isDefault) {\nthis.accountId = accountId;\n@@ -51,6 +52,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.fcmSenderId = manifest.getFCMSenderId();\nthis.packageName = manifest.getPackageName();\nthis.enableCustomCleverTapId = manifest.useCustomId();\n+ this.beta = manifest.enableBeta();\n}\nCleverTapInstanceConfig(CleverTapInstanceConfig config) {\n@@ -73,6 +75,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.enableABTesting = config.enableABTesting;\nthis.enableUIEditor = config.enableUIEditor;\nthis.packageName = config.packageName;\n+ this.beta = config.beta;\n}\nprivate CleverTapInstanceConfig(String jsonString) throws Throwable {\n@@ -116,7 +119,9 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.enableCustomCleverTapId = configJsonObject.getBoolean(Constants.KEY_ENABLE_CUSTOM_CT_ID);\nif(configJsonObject.has(Constants.KEY_FCM_SENDER_ID))\nthis.gcmSenderId = configJsonObject.getString(Constants.KEY_FCM_SENDER_ID);\n-\n+ if(configJsonObject.has(\"beta\")) {\n+ this.beta = configJsonObject.getBoolean(\"beta\");\n+ }\n} catch (Throwable t){\nLogger.v(\"Error constructing CleverTapInstanceConfig from JSON: \" + jsonString +\": \", t.getCause());\nthrow(t);\n@@ -143,6 +148,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nenableUIEditor = in.readByte() != 0x00;\npackageName = in.readString();\nlogger = new Logger(debugLevel);\n+ beta = in.readByte() != 0x00;\n}\n@SuppressWarnings(\"unused\")\n@@ -322,6 +328,10 @@ public class CleverTapInstanceConfig implements Parcelable {\nreturn packageName;\n}\n+ public boolean isBeta() {\n+ return beta;\n+ }\n+\n@Override\npublic int describeContents() {\nreturn 0;\n@@ -347,6 +357,7 @@ public class CleverTapInstanceConfig implements Parcelable {\ndest.writeByte((byte) (enableUIEditor ? 0x01 : 0x00));\ndest.writeByte((byte) (enableABTesting ? 0x01 : 0x00));\ndest.writeString(packageName);\n+ dest.writeByte((byte) (beta ? 0x01 : 0x00));\n}\n@SuppressWarnings(\"unused\")\n@@ -381,6 +392,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nconfigJsonObject.put(Constants.KEY_BACKGROUND_SYNC, isBackgroundSync());\nconfigJsonObject.put(Constants.KEY_ENABLE_CUSTOM_CT_ID, getEnableCustomCleverTapId());\nconfigJsonObject.put(Constants.KEY_FCM_SENDER_ID, getFcmSenderId());\n+ configJsonObject.put(Constants.KEY_BETA, isBeta());\nreturn configJsonObject.toString();\n}catch (Throwable e){\nLogger.v(\"Unable to convert config to JSON : \",e.getCause());\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": "@@ -19,6 +19,7 @@ public class Constants {\nstatic final String LABEL_USE_GOOGLE_AD_ID = \"CLEVERTAP_USE_GOOGLE_AD_ID\";\nstatic final String LABEL_FCM_SENDER_ID = \"FCM_SENDER_ID\";\nstatic final String LABEL_PACKAGE_NAME = \"CLEVERTAP_APP_PACKAGE\";\n+ static final String LABEL_BETA = \"CLEVERTAP_BETA\";\nstatic final String CLEVERTAP_OPTOUT = \"ct_optout\";\nstatic final String CLEVERTAP_STORAGE_TAG = \"WizRocket\";\nstatic final String CLEVERTAP_LOG_TAG = \"CleverTap\";\n@@ -151,6 +152,7 @@ public class Constants {\nstatic final String KEY_BUTTONS = \"buttons\";\nstatic final String KEY_CUSTOM_HTML = \"custom-html\";\nstatic final String KEY_ENABLE_CUSTOM_CT_ID = \"getEnableCustomCleverTapId\";\n+ static final String KEY_BETA = \"beta\";\nstatic final String WZRK_PUSH_ID = \"wzrk_pid\";\nstatic final String NOTIF_MSG = \"nm\";\nstatic final String NOTIF_TITLE = \"nt\";\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 boolean useCustomID;\nprivate static String fcmSenderId;\nprivate static String packageName;\n+ private static boolean beta;\nprivate static String _getManifestStringValueForKey(Bundle manifest, String name) {\ntry {\n@@ -64,6 +65,7 @@ class ManifestInfo {\nfcmSenderId = fcmSenderId.replace(\"id:\", \"\");\n}\npackageName = _getManifestStringValueForKey(metaData,Constants.LABEL_PACKAGE_NAME);\n+ beta = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_BETA));\n}\nsynchronized static ManifestInfo getInstance(Context context){\n@@ -97,6 +99,10 @@ class ManifestInfo {\nreturn useADID;\n}\n+ boolean enableBeta(){\n+ return beta;\n+ }\n+\nboolean isAppLaunchedDisabled(){\nreturn appLaunchedDisabled;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -595,7 +595,9 @@ public class CTABTestController {\nfinal String protocol = \"wss\";\n//final String dashboardDomain = /*@\"dashboard.clevertap.com\"*/ \"f43cc14f.ngrok.io\"; // TODO put final production dashboard link\nfinal String dashboardDomain = \"eu1-dashboard-staging-2.dashboard.clevertap.com\"; //Staging link\n- final String domain = config.getAccountRegion() != null ? config.getAccountRegion()+\".\"+dashboardDomain : dashboardDomain;\n+ String _domain = config.getAccountRegion() != null ? config.getAccountRegion()+\".\"+dashboardDomain : dashboardDomain;\n+ _domain = config.isBeta() ? \"beta.\"+ _domain : _domain;\n+ final String domain = _domain;\nfinal String url = protocol+\"://\"+domain+\"/\"+getAccountId()+\"/\"+\"websocket/screenab/sdk?tk=\"+config.getAccountToken();\ngetConfigLogger().verbose(getAccountId(), \"Websocket URL - \" + url);\ntry {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | add beta flag in manifest and config, enable beta connection in ab tests |
116,623 | 26.08.2019 12:29:02 | -19,080 | f281956d96ded488d3f170b31d8ba23f43beb4c2 | Removing GCM from SDK and other refactoring | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -957,7 +957,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\npublic interface DevicePushTokenRefreshListener {\n/**\n* @param token the device token\n- * @param type the token type com.clevertap.android.sdk.PushType (FCM or GCM)\n+ * @param type the token type com.clevertap.android.sdk.PushType (FCM)\n*/\nvoid devicePushTokenDidRefresh(String token, PushType type);\n}\n@@ -1179,7 +1179,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* Returns the device push token or null\n*\n- * @param type com.clevertap.android.sdk.PushType (FCM or GCM)\n+ * @param type com.clevertap.android.sdk.PushType (FCM)\n* @return String device token or null\n* NOTE: on initial install calling getDevicePushToken may return null, as the device token is\n* not yet available\n@@ -5227,7 +5227,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* Checks whether this notification is from CleverTap.\n*\n- * @param extras The payload from the GCM intent\n+ * @param extras The payload from the FCM intent\n* @return See {@link NotificationInfo}\n*/\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\n@@ -5243,7 +5243,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* Launches an asynchronous task to download the notification icon from CleverTap,\n* and create the Android notification.\n* <p/>\n- * Use this method when implementing your own FCM/GCM handling mechanism. Refer to the\n+ * Use this method when implementing your own FCM handling mechanism. Refer to the\n* SDK documentation for usage scenarios and examples.\n*\n* @param context A reference to an Android context\n@@ -5258,10 +5258,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* Launches an asynchronous task to download the notification icon from CleverTap,\n* and create the Android notification.\n* <p>\n- * If your app is using CleverTap SDK's built in FCM/GCM message handling,\n+ * If your app is using CleverTap SDK's built in FCM message handling,\n* this method does not need to be called explicitly.\n* <p/>\n- * Use this method when implementing your own FCM/GCM handling mechanism. Refer to the\n+ * Use this method when implementing your own FCM handling mechanism. Refer to the\n* SDK documentation for usage scenarios and examples.\n*\n* @param context A reference to an Android context\n@@ -5299,10 +5299,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* Launches an asynchronous task to download the notification icon from CleverTap,\n* and create the Android notification.\n* <p/>\n- * If your app is using CleverTap SDK's built in FCM/GCM message handling,\n+ * If your app is using CleverTap SDK's built in FCM message handling,\n* this method does not need to be called explicitly.\n* <p/>\n- * Use this method when implementing your own FCM/GCM handling mechanism. Refer to the\n+ * Use this method when implementing your own FCM handling mechanism. Refer to the\n* SDK documentation for usage scenarios and examples.\n*\n* @param context A reference to an Android context\n@@ -5681,7 +5681,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* Launches an asynchronous task to create the notification channel from CleverTap\n* <p/>\n- * Use this method when implementing your own FCM/GCM handling mechanism. Refer to the\n+ * Use this method when implementing your own FCM handling mechanism. Refer to the\n* SDK documentation for usage scenarios and examples.\n*\n* @param context A reference to an Android context\n@@ -5726,7 +5726,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* Launches an asynchronous task to create the notification channel from CleverTap\n* <p/>\n- * Use this method when implementing your own FCM/GCM handling mechanism and creating\n+ * Use this method when implementing your own FCM handling mechanism and creating\n* notification channel groups. Refer to the\n* SDK documentation for usage scenarios and examples.\n*\n@@ -5775,7 +5775,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* Launches an asynchronous task to create the notification channel from CleverTap\n* <p/>\n- * Use this method when implementing your own FCM/GCM handling mechanism. Refer to the\n+ * Use this method when implementing your own FCM handling mechanism. Refer to the\n* SDK documentation for usage scenarios and examples.\n*\n* @param context A reference to an Android context\n@@ -5840,7 +5840,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* Launches an asynchronous task to create the notification channel from CleverTap\n* <p/>\n- * Use this method when implementing your own FCM/GCM handling mechanism and creating\n+ * Use this method when implementing your own FCM handling mechanism and creating\n* notification channel groups. Refer to the\n* SDK documentation for usage scenarios and examples.\n*\n@@ -5909,7 +5909,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* Launches an asynchronous task to create the notification channel group from CleverTap\n* <p/>\n- * Use this method when implementing your own FCM/GCM handling mechanism. Refer to the\n+ * Use this method when implementing your own FCM handling mechanism. Refer to the\n* SDK documentation for usage scenarios and examples.\n*\n* @param context A reference to an Android context\n@@ -5946,7 +5946,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* Launches an asynchronous task to delete the notification channel from CleverTap\n* <p/>\n- * Use this method when implementing your own FCM/GCM handling mechanism. Refer to the\n+ * Use this method when implementing your own FCM handling mechanism. Refer to the\n* SDK documentation for usage scenarios and examples.\n*\n* @param context A reference to an Android context\n@@ -5982,7 +5982,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* Launches an asynchronous task to delete the notification channel from CleverTap\n* <p/>\n- * Use this method when implementing your own FCM/GCM handling mechanism. Refer to the\n+ * Use this method when implementing your own FCM handling mechanism. Refer to the\n* SDK documentation for usage scenarios and examples.\n*\n* @param context A reference to an Android context\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"diff": "@@ -12,7 +12,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nprivate String accountId;\nprivate String accountToken;\nprivate String accountRegion;\n- private String gcmSenderId;\nprivate boolean analyticsOnly;\nprivate boolean isDefaultInstance;\nprivate boolean useGoogleAdId;\n@@ -46,7 +45,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nManifestInfo manifest = ManifestInfo.getInstance(context);\nthis.useGoogleAdId = manifest.useGoogleAdId();\nthis.disableAppLaunchedEvent = manifest.isAppLaunchedDisabled();\n- this.gcmSenderId = manifest.getGCMSenderId();\nthis.sslPinning = manifest.isSSLPinningEnabled();\nthis.backgroundSync = manifest.isBackgroundSync();\nthis.fcmSenderId = manifest.getFCMSenderId();\n@@ -66,7 +64,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.logger = config.logger;\nthis.useGoogleAdId = config.useGoogleAdId;\nthis.disableAppLaunchedEvent = config.disableAppLaunchedEvent;\n- this.gcmSenderId = config.gcmSenderId;\nthis.createdPostAppLaunch = config.createdPostAppLaunch;\nthis.sslPinning = config.sslPinning;\nthis.backgroundSync = config.backgroundSync;\n@@ -87,8 +84,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.accountToken = configJsonObject.getString(Constants.KEY_ACCOUNT_TOKEN);\nif(configJsonObject.has(Constants.KEY_ACCOUNT_REGION))\nthis.accountRegion = configJsonObject.getString(Constants.KEY_ACCOUNT_REGION);\n- if(configJsonObject.has(\"gcmSenderId\"))\n- this.gcmSenderId = configJsonObject.getString(\"gcmSenderId\");\nif(configJsonObject.has(Constants.KEY_ANALYTICS_ONLY))\nthis.analyticsOnly = configJsonObject.getBoolean(Constants.KEY_ANALYTICS_ONLY);\nif(configJsonObject.has(Constants.KEY_DEFAULT_INSTANCE))\n@@ -103,12 +98,12 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.debugLevel = configJsonObject.getInt(Constants.KEY_DEBUG_LEVEL);\n}\nthis.logger = new Logger(this.debugLevel);\n- if(configJsonObject.has(\"enableABTesting\"))\n- this.enableABTesting = configJsonObject.getBoolean(\"enableABTesting\");\n- if(configJsonObject.has(\"enableUIEditor\"))\n- this.enableUIEditor = configJsonObject.getBoolean(\"enableUIEditor\");\n- if(configJsonObject.has(\"packageName\"))\n- this.packageName = configJsonObject.getString(\"packageName\");\n+ if(configJsonObject.has(Constants.KEY_ENABLE_ABTEST))\n+ this.enableABTesting = configJsonObject.getBoolean(Constants.KEY_ENABLE_ABTEST);\n+ if(configJsonObject.has(Constants.KEY_ENABLE_UIEDITOR))\n+ this.enableUIEditor = configJsonObject.getBoolean(Constants.KEY_ENABLE_UIEDITOR);\n+ if(configJsonObject.has(Constants.KEY_PACKAGE_NAME))\n+ this.packageName = configJsonObject.getString(Constants.KEY_PACKAGE_NAME);\nif(configJsonObject.has(Constants.KEY_CREATED_POST_APP_LAUNCH))\nthis.createdPostAppLaunch = configJsonObject.getBoolean(Constants.KEY_CREATED_POST_APP_LAUNCH);\nif(configJsonObject.has(Constants.KEY_SSL_PINNING))\n@@ -118,9 +113,9 @@ public class CleverTapInstanceConfig implements Parcelable {\nif(configJsonObject.has(Constants.KEY_ENABLE_CUSTOM_CT_ID))\nthis.enableCustomCleverTapId = configJsonObject.getBoolean(Constants.KEY_ENABLE_CUSTOM_CT_ID);\nif(configJsonObject.has(Constants.KEY_FCM_SENDER_ID))\n- this.gcmSenderId = configJsonObject.getString(Constants.KEY_FCM_SENDER_ID);\n- if(configJsonObject.has(\"beta\")) {\n- this.beta = configJsonObject.getBoolean(\"beta\");\n+ this.fcmSenderId = configJsonObject.getString(Constants.KEY_FCM_SENDER_ID);\n+ if(configJsonObject.has(Constants.KEY_BETA)) {\n+ this.beta = configJsonObject.getBoolean(Constants.KEY_BETA);\n}\n} catch (Throwable t){\nLogger.v(\"Error constructing CleverTapInstanceConfig from JSON: \" + jsonString +\": \", t.getCause());\n@@ -132,7 +127,6 @@ public class CleverTapInstanceConfig implements Parcelable {\naccountId = in.readString();\naccountToken = in.readString();\naccountRegion = in.readString();\n- gcmSenderId = in.readString();\nanalyticsOnly = in.readByte() != 0x00;\nisDefaultInstance = in.readByte() != 0x00;\nuseGoogleAdId = in.readByte() != 0x00;\n@@ -201,10 +195,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nreturn accountRegion;\n}\n- private String getGCMSenderId() {\n- return gcmSenderId;\n- }\n-\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\npublic boolean isAnalyticsOnly() {\nreturn analyticsOnly;\n@@ -337,50 +327,48 @@ public class CleverTapInstanceConfig implements Parcelable {\nreturn 0;\n}\n+ @SuppressWarnings(\"unused\")\n+ public static final Parcelable.Creator<CleverTapInstanceConfig> CREATOR = new Parcelable.Creator<CleverTapInstanceConfig>() {\n+ @Override\n+ public CleverTapInstanceConfig createFromParcel(Parcel in) {\n+ return new CleverTapInstanceConfig(in);\n+ }\n+\n+ @Override\n+ public CleverTapInstanceConfig[] newArray(int size) {\n+ return new CleverTapInstanceConfig[size];\n+ }\n+ };\n+\n@Override\npublic void writeToParcel(Parcel dest, int flags) {\ndest.writeString(accountId);\ndest.writeString(accountToken);\ndest.writeString(accountRegion);\n- dest.writeString(gcmSenderId);\ndest.writeByte((byte) (analyticsOnly ? 0x01 : 0x00));\ndest.writeByte((byte) (isDefaultInstance ? 0x01 : 0x00));\ndest.writeByte((byte) (useGoogleAdId ? 0x01 : 0x00));\ndest.writeByte((byte) (disableAppLaunchedEvent ? 0x01 : 0x00));\ndest.writeByte((byte) (personalization ? 0x01 : 0x00));\ndest.writeInt(debugLevel);\n- dest.writeByte((byte) (sslPinning ? 0x01 : 0x00));\ndest.writeByte((byte) (createdPostAppLaunch ? 0x01 : 0x00));\n+ dest.writeByte((byte) (sslPinning ? 0x01 : 0x00));\ndest.writeByte((byte) (backgroundSync ? 0x01 : 0x00));\ndest.writeByte((byte) (enableCustomCleverTapId ? 0x01 : 0x00));\ndest.writeString(fcmSenderId);\n- dest.writeByte((byte) (enableUIEditor ? 0x01 : 0x00));\ndest.writeByte((byte) (enableABTesting ? 0x01 : 0x00));\n+ dest.writeByte((byte) (enableUIEditor ? 0x01 : 0x00));\ndest.writeString(packageName);\ndest.writeByte((byte) (beta ? 0x01 : 0x00));\n}\n- @SuppressWarnings(\"unused\")\n- public static final Parcelable.Creator<CleverTapInstanceConfig> CREATOR = new Parcelable.Creator<CleverTapInstanceConfig>() {\n- @Override\n- public CleverTapInstanceConfig createFromParcel(Parcel in) {\n- return new CleverTapInstanceConfig(in);\n- }\n-\n- @Override\n- public CleverTapInstanceConfig[] newArray(int size) {\n- return new CleverTapInstanceConfig[size];\n- }\n- };\n-\nString toJSONString() {\nJSONObject configJsonObject = new JSONObject();\ntry{\nconfigJsonObject.put(Constants.KEY_ACCOUNT_ID, getAccountId());\nconfigJsonObject.put(Constants.KEY_ACCOUNT_TOKEN, getAccountToken());\nconfigJsonObject.put(Constants.KEY_ACCOUNT_REGION, getAccountRegion());\n- configJsonObject.put(\"gcmSenderId\", getGCMSenderId());\n- configJsonObject.put(\"packageName\", getFcmSenderId());\n+ configJsonObject.put(Constants.KEY_FCM_SENDER_ID, getFcmSenderId());\nconfigJsonObject.put(Constants.KEY_ANALYTICS_ONLY, isAnalyticsOnly());\nconfigJsonObject.put(Constants.KEY_DEFAULT_INSTANCE, isDefaultInstance());\nconfigJsonObject.put(Constants.KEY_USE_GOOGLE_AD_ID, isUseGoogleAdId());\n@@ -391,8 +379,10 @@ public class CleverTapInstanceConfig implements Parcelable {\nconfigJsonObject.put(Constants.KEY_SSL_PINNING, isSslPinningEnabled());\nconfigJsonObject.put(Constants.KEY_BACKGROUND_SYNC, isBackgroundSync());\nconfigJsonObject.put(Constants.KEY_ENABLE_CUSTOM_CT_ID, getEnableCustomCleverTapId());\n- configJsonObject.put(Constants.KEY_FCM_SENDER_ID, getFcmSenderId());\n+ configJsonObject.put(Constants.KEY_PACKAGE_NAME, getPackageName());\nconfigJsonObject.put(Constants.KEY_BETA, isBeta());\n+ configJsonObject.put(Constants.KEY_ENABLE_UIEDITOR,isUIEditorEnabled());\n+ configJsonObject.put(Constants.KEY_ENABLE_ABTEST,isABTestingEnabled());\nreturn configJsonObject.toString();\n}catch (Throwable e){\nLogger.v(\"Unable to convert config to JSON : \",e.getCause());\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": "@@ -71,7 +71,6 @@ public class Constants {\nstatic final int NOTIFICATION_VIEWED_ID_TAG_INTERVAL = 2000;\nstatic final String SESSION_ID_LAST = \"lastSessionId\";\nstatic final String LAST_SESSION_EPOCH = \"sexe\";\n- static final String LABEL_SENDER_ID = \"GCM_SENDER_ID\";\nstatic final int MAX_KEY_LENGTH = 120;\nstatic final int MAX_VALUE_LENGTH = 512;\nstatic final int MAX_MULTI_VALUE_ARRAY_LENGTH = 100;\n@@ -153,6 +152,9 @@ public class Constants {\nstatic final String KEY_CUSTOM_HTML = \"custom-html\";\nstatic final String KEY_ENABLE_CUSTOM_CT_ID = \"getEnableCustomCleverTapId\";\nstatic final String KEY_BETA = \"beta\";\n+ static final String KEY_PACKAGE_NAME = \"packageName\";\n+ static final String KEY_ENABLE_UIEDITOR = \"enableUIEditor\";\n+ static final String KEY_ENABLE_ABTEST = \"enableABTesting\";\nstatic final String WZRK_PUSH_ID = \"wzrk_pid\";\nstatic final String NOTIF_MSG = \"nm\";\nstatic final String NOTIF_TITLE = \"nt\";\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": "@@ -9,7 +9,6 @@ class ManifestInfo {\nprivate static String accountId;\nprivate static String accountToken;\nprivate static String accountRegion;\n- private static String gcmSenderId;\nprivate static boolean useADID;\nprivate static boolean appLaunchedDisabled;\nprivate static String notificationIcon;\n@@ -49,11 +48,7 @@ class ManifestInfo {\naccountToken = _getManifestStringValueForKey(metaData, Constants.LABEL_TOKEN);\nif(accountRegion==null)\naccountRegion = _getManifestStringValueForKey(metaData, Constants.LABEL_REGION);\n- gcmSenderId = _getManifestStringValueForKey(metaData, Constants.LABEL_SENDER_ID);\nnotificationIcon = _getManifestStringValueForKey(metaData,Constants.LABEL_NOTIFICATION_ICON);\n- if (gcmSenderId != null) {\n- gcmSenderId = gcmSenderId.replace(\"id:\", \"\");\n- }\nuseADID = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_USE_GOOGLE_AD_ID));\nappLaunchedDisabled = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_DISABLE_APP_LAUNCH));\nexcludedActivities = _getManifestStringValueForKey(metaData,Constants.LABEL_INAPP_EXCLUDE);\n@@ -87,10 +82,6 @@ class ManifestInfo {\nreturn accountRegion;\n}\n- String getGCMSenderId(){\n- return gcmSenderId;\n- }\n-\nString getFCMSenderId() {\nreturn fcmSenderId;\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": "@@ -46,10 +46,9 @@ final class ManifestValidator {\n//no-op\nif (pushType == PushType.FCM) {\ntry {\n- // use class name string directly here to avoid class not found issues on class import, because we only use one of FCM or GCM\n+ // use class name string directly here to avoid class not found issues on class import, because we only use FCM\nvalidateServiceInManifest((Application) context.getApplicationContext(), \"com.clevertap.android.sdk.FcmMessageListenerService\");\nvalidateServiceInManifest((Application) context.getApplicationContext(), \"com.clevertap.android.sdk.FcmTokenListenerService\");\n-\n} catch (Exception e) {\nLogger.v(\"Receiver/Service issue : \" + e.toString());\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/NotificationInfo.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/NotificationInfo.java",
"diff": "@@ -3,7 +3,7 @@ package com.clevertap.android.sdk;\nimport android.os.Bundle;\n/**\n- * Contains information regarding the notification payload in the GCM intent.\n+ * Contains information regarding the notification payload in the FCM intent.\n* <p/>\n* Use {@link CleverTapAPI#getNotificationInfo(Bundle)} to retrieve this information.\n*/\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Removing GCM from SDK and other refactoring |
116,623 | 28.08.2019 11:55:26 | -19,080 | c2419b8ed7f92dba5d2d76cb7b3f4d0e3b7ef9a6 | Modifying certain Logger functions to print really long logs | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Logger.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Logger.java",
"diff": "@@ -50,9 +50,14 @@ public final class Logger {\npublic void debug(String suffix, String message){\nif(getStaticDebugLevel() > CleverTapAPI.LogLevel.INFO.intValue()){\n+ if(message.length() > 4000){\n+ Log.d(Constants.CLEVERTAP_LOG_TAG + \":\" + suffix, message.substring(0,4000));\n+ debug(suffix,message.substring(4000));\n+ }else {\nLog.d(Constants.CLEVERTAP_LOG_TAG + \":\" + suffix, message);\n}\n}\n+ }\npublic void debug(String suffix, String message, Throwable t){\nif(getStaticDebugLevel() > CleverTapAPI.LogLevel.INFO.intValue()){\nLog.d(Constants.CLEVERTAP_LOG_TAG+\":\"+suffix, message,t);\n@@ -94,9 +99,14 @@ public final class Logger {\n}\npublic void verbose(String suffix, String message){\nif(getStaticDebugLevel() > CleverTapAPI.LogLevel.DEBUG.intValue()){\n+ if(message.length() > 4000){\n+ Log.v(Constants.CLEVERTAP_LOG_TAG + \":\" + suffix, message.substring(0,4000));\n+ verbose(suffix,message.substring(4000));\n+ }else {\nLog.v(Constants.CLEVERTAP_LOG_TAG + \":\" + suffix, message);\n}\n}\n+ }\npublic void verbose(String suffix, String message, Throwable t){\nif(getStaticDebugLevel() > CleverTapAPI.LogLevel.DEBUG.intValue()){\nLog.v(Constants.CLEVERTAP_LOG_TAG+\":\"+suffix, message,t);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Modifying certain Logger functions to print really long logs |
116,623 | 28.08.2019 14:32:06 | -19,080 | 25be84edd3686a2f0657a69d3fe0dc5a8d9925b6 | Fixing a silent crash issue where CleverTapInstanceConfig was not found when passed to an activity | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxActivity.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxActivity.java",
"diff": "@@ -64,7 +64,10 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nBundle extras = getIntent().getExtras();\nif(extras == null) throw new IllegalArgumentException();\nstyleConfig = extras.getParcelable(\"styleConfig\");\n- config = extras.getParcelable(\"config\");\n+ Bundle configBundle = extras.getBundle(\"configBundle\");\n+ if (configBundle != null) {\n+ config = configBundle.getParcelable(\"config\");\n+ }\ncleverTapAPI = CleverTapAPI.instanceWithConfig(getApplicationContext(), config);\nif (cleverTapAPI != null) {\nsetListener(cleverTapAPI);\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": "@@ -2760,7 +2760,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nIntent intent = new Intent(context,InAppNotificationActivity.class);\nintent.putExtra(\"inApp\",inAppNotification);\n- intent.putExtra(\"config\",config);\n+ Bundle configBundle = new Bundle();\n+ configBundle.putParcelable(\"config\",config);\n+ intent.putExtra(\"configBundle\", configBundle);\ntry {\nActivity currentActivity = getCurrentActivity();\nif (currentActivity == null) {\n@@ -6479,7 +6481,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nIntent intent = new Intent(context, CTInboxActivity.class);\nintent.putExtra(\"styleConfig\", _styleConfig);\n- intent.putExtra(\"config\", config);\n+ Bundle configBundle = new Bundle();\n+ configBundle.putParcelable(\"config\",config);\n+ intent.putExtra(\"configBundle\", configBundle);\ntry {\nActivity currentActivity = getCurrentActivity();\nif (currentActivity == null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -62,7 +62,10 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nBundle notif = getIntent().getExtras();\nif (notif == null) throw new IllegalArgumentException();\ninAppNotification = notif.getParcelable(\"inApp\");\n- config = notif.getParcelable(\"config\");\n+ Bundle configBundle = notif.getBundle(\"configBundle\");\n+ if (configBundle != null) {\n+ config = configBundle.getParcelable(\"config\");\n+ }\nsetListener(CleverTapAPI.instanceWithConfig(getApplicationContext(),config));\n} catch (Throwable t) {\nLogger.v(\"Cannot find a valid notification bundle to show!\", t);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fixing a silent crash issue where CleverTapInstanceConfig was not found when passed to an activity |
116,623 | 28.08.2019 18:32:50 | -19,080 | af5f690ae1b6d20b7a4a2ea201a8d627ea383568 | Using application context from activity in lifecycle callbacks to create instance | [
{
"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": "@@ -312,7 +312,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nstatic void onActivityCreated(Activity activity, String cleverTapID) {\n// make sure we have at least the default instance created here.\nif (instances == null) {\n- CleverTapAPI.createInstanceIfAvailable(activity, null,cleverTapID);\n+ CleverTapAPI.createInstanceIfAvailable(activity.getApplicationContext(), null,cleverTapID);\n}\nif (instances == null) {\n@@ -392,7 +392,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@SuppressWarnings(\"WeakerAccess\")\npublic static void onActivityResumed(Activity activity, String cleverTapID) {\nif (instances == null) {\n- CleverTapAPI.createInstanceIfAvailable(activity, null,cleverTapID);\n+ CleverTapAPI.createInstanceIfAvailable(activity.getApplicationContext(), null,cleverTapID);\n}\nCleverTapAPI.setAppForeground(true);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Using application context from activity in lifecycle callbacks to create instance |
116,623 | 03.09.2019 17:12:40 | -19,080 | ac038db9cb74aeb8297cb892f183f2b9279c2ed6 | Adding manuacturer name to device name during handshake | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -760,7 +760,7 @@ public class CTABTestController {\nJSONObject data = new JSONObject();\ndata.put(\"id\", guid);\ndata.put(\"os\", deviceInfo.getString(\"osName\"));\n- data.put(\"name\", deviceInfo.getString(\"model\"));\n+ data.put(\"name\", deviceInfo.getString(\"manufacturer\")+\" \"+deviceInfo.getString(\"model\"));\nif(deviceInfo.has(\"library\")){\ndata.put(\"library\",deviceInfo.getString(\"library\"));\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Adding manuacturer name to device name during handshake |
116,623 | 06.09.2019 19:24:36 | -19,080 | 3745d1915f5cdef853e1de1d820eb02d64937f19 | Fix bug where reverting experiment needed an extra App launch | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -713,7 +713,7 @@ public class CTABTestController {\n}\nprivate void loadVariants(JSONArray experiments){\n- if (experiments == null || experiments.length() <= 0) {\n+ if (experiments == null) {\nreturn;\n}\n// note: experiments here will be all the currently running experiments for the user\n@@ -740,6 +740,13 @@ public class CTABTestController {\n}\n}\n}\n+\n+ //This will revert changes at SDK level when all experiments are stopped/revert without needing\n+ //another App Launched event\n+ if(experiments.length() == 0){\n+ allVariants.clear();\n+ }\n+\nthis.variants = allVariants;\n} catch (JSONException e) {\ngetConfigLogger().verbose(getAccountId(), \"Error loading variants, clearing all running variants\", e);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/UIEditor.java",
"diff": "@@ -247,9 +247,8 @@ public class UIEditor {\n}\n}\n- if(isEditorSession) {\nclearEdits();\n- }\n+\nsynchronized(newEdits) {\nnewEdits.clear();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fix bug where reverting experiment needed an extra App launch |
116,623 | 11.09.2019 14:00:53 | -19,080 | 6374fc0d99cfe94911f888a9329b33641bf34220 | Adding fix for custom URL in InApp opening Chrome browser | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullHtmlFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullHtmlFragment.java",
"diff": "@@ -187,6 +187,7 @@ public abstract class CTInAppBaseFullHtmlFragment extends CTInAppBaseFullFragmen\nwebView.loadDataWithBaseURL(null, html, \"text/html\", \"utf-8\", null);\n}else{\nString url = inAppNotification.getCustomInAppUrl();\n+ webView.setWebViewClient(new WebViewClient());\nwebView.loadUrl(url);\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Adding fix for custom URL in InApp opening Chrome browser |
116,623 | 11.09.2019 15:17:09 | -19,080 | 0a0f9d5c42251384b67bdabda0f2241ab4242a3b | Sanitising URLs from dashboard as per PR | [
{
"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": "@@ -93,7 +93,7 @@ public abstract class CTInAppBaseFragment extends Fragment {\nvoid fireUrlThroughIntent(String url, Bundle formData) {\ntry {\n- Uri uri = Uri.parse(url);\n+ Uri uri = Uri.parse(url.replace(\"\\n\", \"\").replace(\"\\r\", \"\"));\nSet<String> queryParamSet = uri.getQueryParameterNames();\nBundle queryBundle = new Bundle();\nif(queryParamSet != null && !queryParamSet.isEmpty()){\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": "@@ -250,7 +250,7 @@ public class CTInboxListViewFragment extends Fragment {\nvoid fireUrlThroughIntent(String url) {\ntry {\n- Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));\n+ Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url.replace(\"\\n\", \"\").replace(\"\\r\", \"\")));\nstartActivity(intent);\n} catch (Throwable t) {\n// Ignore\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -332,7 +332,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nvoid fireUrlThroughIntent(String url, Bundle formData) {\ntry {\n- Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));\n+ Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url.replace(\"\\n\", \"\").replace(\"\\r\", \"\")));\nstartActivity(intent);\n} catch (Throwable t) {\n// Ignore\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Sanitising URLs from dashboard as per PR #29 |
116,621 | 13.09.2019 12:00:29 | -19,080 | b00d7d09682559c9605923b96e53ca1a8f4bac2c | 1. Anr Fix
2. update ping frequency using silent notification payload. | [
{
"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": "@@ -37,6 +37,7 @@ import android.support.annotation.NonNull;\nimport android.support.annotation.Nullable;\nimport android.support.annotation.RequiresApi;\nimport android.support.v4.app.NotificationCompat;\n+import android.text.TextUtils;\nimport com.clevertap.android.sdk.exceptions.CleverTapMetaDataNotFoundException;\n@@ -2519,25 +2520,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (pushAmpObject.has(\"pf\")) {\ntry {\nint frequency = pushAmpObject.getInt(\"pf\");\n- getConfigLogger().verbose(\"Ping frequency received - \" + frequency);\n- getConfigLogger().verbose(\"Stored Ping Frequency - \" + getPingFrequency(context));\n- if (frequency != getPingFrequency(context)) {\n- setPingFrequency(context, frequency);\n- if (this.config.isBackgroundSync() && !this.config.isAnalyticsOnly()) {\n- postAsyncSafely(\"createOrResetJobScheduler\", new Runnable() {\n- @Override\n- public void run() {\n- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {\n- getConfigLogger().verbose(\"Creating job\");\n- createOrResetJobScheduler(context);\n- } else {\n- getConfigLogger().verbose(\"Resetting alarm\");\n- resetAlarmScheduler(context);\n- }\n- }\n- });\n- }\n- }\n+ updatePingFrequencyIfNeeded(context, frequency);\n}catch (Throwable t){\ngetConfigLogger().verbose(\"Error handling ping frequency in response : \"+ t.getMessage());\n}\n@@ -2571,6 +2554,34 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n+ /**\n+ * updates the ping frequency if there is a change & reschedules existing ping tasks.\n+ *\n+ * @param context\n+ * @param frequency-\n+ */\n+ private void updatePingFrequencyIfNeeded(final Context context, int frequency) {\n+ getConfigLogger().verbose(\"Ping frequency received - \" + frequency);\n+ getConfigLogger().verbose(\"Stored Ping Frequency - \" + getPingFrequency(context));\n+ if (frequency != getPingFrequency(context)) {\n+ setPingFrequency(context, frequency);\n+ if (this.config.isBackgroundSync() && !this.config.isAnalyticsOnly()) {\n+ postAsyncSafely(\"createOrResetJobScheduler\", new Runnable() {\n+ @Override\n+ public void run() {\n+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {\n+ getConfigLogger().verbose(\"Creating job\");\n+ createOrResetJobScheduler(context);\n+ } else {\n+ getConfigLogger().verbose(\"Resetting alarm\");\n+ resetAlarmScheduler(context);\n+ }\n+ }\n+ });\n+ }\n+ }\n+ }\n+\nprivate int getPingFrequency(Context context) {\nreturn StorageHelper.getInt(context,Constants.PING_FREQUENCY,Constants.PING_FREQUENCY_VALUE); //intentional global key because only one Job is running\n}\n@@ -5453,8 +5464,13 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nString notifMessage = extras.getString(Constants.NOTIF_MSG);\nnotifMessage = (notifMessage != null) ? notifMessage : \"\";\nif (notifMessage.isEmpty()) {\n+ //silent notification\ngetConfigLogger().verbose(getAccountId(),\"Push notification message is empty, not rendering\");\nloadDBAdapter(context).storeUninstallTimestamp();\n+ String pingFreq = extras.getString(\"pf\", \"\");\n+ if (!TextUtils.isEmpty(pingFreq)) {\n+ updatePingFrequencyIfNeeded(context, Integer.parseInt(pingFreq));\n+ }\nreturn;\n}\nString notifTitle = extras.getString(Constants.NOTIF_TITLE, \"\");\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/StorageHelper.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/StorageHelper.java",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk;\nimport android.content.Context;\nimport android.content.SharedPreferences;\n+import android.os.Build;\nfinal class StorageHelper {\nstatic void putString(Context context, String key, String value) {\n@@ -75,9 +76,18 @@ final class StorageHelper {\nreturn getPreferences(context, null);\n}\n- static void persist(SharedPreferences.Editor editor) {\n+ static void persist(final SharedPreferences.Editor editor) {\ntry {\n+ if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {\neditor.apply();\n+ } else {\n+ new Thread(new Runnable() {\n+ @Override\n+ public void run() {\n+ editor.commit();\n+ }\n+ }).start();\n+ }\n} catch (Throwable t) {\nLogger.v(\"CRITICAL: Failed to persist shared preferences!\", t);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | 1. Anr Fix
2. update ping frequency using silent notification payload. |
116,621 | 13.09.2019 12:42:33 | -19,080 | 5393f16a331c2845c8c557263fae750537f3c52a | 1. Posting commit on a threadpool executor | [
{
"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": "@@ -4,7 +4,13 @@ import android.content.Context;\nimport android.content.SharedPreferences;\nimport android.os.Build;\n+import java.util.concurrent.ExecutorService;\n+import java.util.concurrent.Executors;\n+\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@@ -81,15 +87,41 @@ final class StorageHelper {\nif (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {\neditor.apply();\n} else {\n- new Thread(new Runnable() {\n+ postAsyncSafely(new Runnable() {\n@Override\npublic void run() {\neditor.commit();\n}\n- }).start();\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 | 1. Posting commit on a threadpool executor |
116,623 | 17.09.2019 16:07:06 | -19,080 | df9ef0e73831924260a92573bc1b6d65211df1fa | Fixing revertion of stopped experiment in same session and adding prod websocket connection | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -86,6 +86,7 @@ public class CTABTestController {\nprivate static final ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.allocate(0);\nprivate static final int EMULATOR_CONNECT_ATTEMPT_INTERVAL_MILLIS = 1000 * 30;\n+ private static final String DASHBOARD_URL = \"dashboard.clevertap.com\";\nprivate static final String MESSAGE_TYPE_HANDSHAKE = \"handshake\";\nprivate static final String MESSAGE_TYPE_CLEAR_REQUEST = \"clear_request\";\nprivate static final String MESSAGE_TYPE_CHANGE_REQUEST = \"change_request\";\n@@ -593,8 +594,8 @@ public class CTABTestController {\n}\nfinal String protocol = \"wss\";\n- //final String dashboardDomain = /*@\"dashboard.clevertap.com\"*/ \"f43cc14f.ngrok.io\"; // TODO put final production dashboard link\n- final String dashboardDomain = \"eu1-dashboard-staging-2.dashboard.clevertap.com\"; //Staging link\n+ final String dashboardDomain = DASHBOARD_URL;\n+ //final String dashboardDomain = \"eu1-dashboard-staging-2.dashboard.clevertap.com\"; //Staging link\nString _domain = config.getAccountRegion() != null ? config.getAccountRegion()+\".\"+dashboardDomain : dashboardDomain;\n_domain = config.isBeta() ? \"beta.\"+ _domain : _domain;\nfinal String domain = _domain;\n@@ -732,14 +733,14 @@ public class CTABTestController {\n}\n}\n}\n- if(!allVariants.containsAll(toRemove)) {\n+ //if(!allVariants.containsAll(toRemove)) {\nif (toRemove.size() > 0) {\nfor (CTABVariant v : toRemove) {\nv.cleanup();\nallVariants.remove(v);\n}\n}\n- }\n+ //}\n//This will revert changes at SDK level when all experiments are stopped/revert without needing\n//another App Launched event\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fixing revertion of stopped experiment in same session and adding prod websocket connection |
116,623 | 19.09.2019 15:32:24 | -19,080 | 278fb4a00ad27b004fccd7aae3b5feed9a20918f | Finalising websocket dashboard link logic | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -87,6 +87,7 @@ public class CTABTestController {\nprivate static final int EMULATOR_CONNECT_ATTEMPT_INTERVAL_MILLIS = 1000 * 30;\nprivate static final String DASHBOARD_URL = \"dashboard.clevertap.com\";\n+ private static final String DEFAULT_REGION = \"eu1\";\nprivate static final String MESSAGE_TYPE_HANDSHAKE = \"handshake\";\nprivate static final String MESSAGE_TYPE_CLEAR_REQUEST = \"clear_request\";\nprivate static final String MESSAGE_TYPE_CHANGE_REQUEST = \"change_request\";\n@@ -595,10 +596,10 @@ public class CTABTestController {\nfinal String protocol = \"wss\";\nfinal String dashboardDomain = DASHBOARD_URL;\n- //final String dashboardDomain = \"eu1-dashboard-staging-2.dashboard.clevertap.com\"; //Staging link\n- String _domain = config.getAccountRegion() != null ? config.getAccountRegion()+\".\"+dashboardDomain : dashboardDomain;\n- _domain = config.isBeta() ? \"beta.\"+ _domain : _domain;\n- final String domain = _domain;\n+ String region = config.getAccountRegion() != null ? config.getAccountRegion() : DEFAULT_REGION;\n+ region = config.isBeta() ? region+\"-dashaboard-beta\" : region;\n+ final String domain = region + \".\" + DASHBOARD_URL;\n+ //final String domain = \"eu1-dashboard-staging-1.dashboard.clevertap.com\"; //Staging link\nfinal String url = protocol+\"://\"+domain+\"/\"+getAccountId()+\"/\"+\"websocket/screenab/sdk?tk=\"+config.getAccountToken();\ngetConfigLogger().verbose(getAccountId(), \"Websocket URL - \" + url);\ntry {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Finalising websocket dashboard link logic |
116,623 | 19.09.2019 19:33:59 | -19,080 | a0b680432b9bd5cf6dbae07b7d0eba823e3b6201 | Changing InApp behavior on only portrait/landscape inapps | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -74,11 +74,6 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n//Allow rotation for all InApps but respect the flags sent from dashboard\nif (inAppNotification.isPortrait() && !inAppNotification.isLandscape()) {\n- try {\n- setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);\n- } catch (Throwable t) {\n- Logger.d(\"Error displaying InAppNotification\", t);\n-\nif (orientation == Configuration.ORIENTATION_LANDSCAPE) {\nLogger.d(\"App in Landscape, dismissing portrait InApp Notification\");\nfinish();\n@@ -88,13 +83,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nLogger.d(\"App in Portrait, displaying InApp Notification anyway\");\n}\n}\n- }\nif (!inAppNotification.isPortrait() && inAppNotification.isLandscape()) {\n- try {\n- setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);\n- } catch (Throwable t) {\n- Logger.d(\"Error displaying InAppNotification\", t);\nif (orientation == Configuration.ORIENTATION_PORTRAIT) {\nLogger.d(\"App in Portrait, dismissing landscape InApp Notification\");\nfinish();\n@@ -104,7 +94,6 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nLogger.d(\"App in Landscape, displaying InApp Notification anyway\");\n}\n}\n- }\nCTInAppBaseFullFragment contentFragment;\nif (savedInstanceState == null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -734,14 +734,14 @@ public class CTABTestController {\n}\n}\n}\n- //if(!allVariants.containsAll(toRemove)) {\n+ if(!allVariants.containsAll(toRemove)) {\nif (toRemove.size() > 0) {\nfor (CTABVariant v : toRemove) {\nv.cleanup();\nallVariants.remove(v);\n}\n}\n- //}\n+ }\n//This will revert changes at SDK level when all experiments are stopped/revert without needing\n//another App Launched event\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Changing InApp behavior on only portrait/landscape inapps |
116,623 | 23.09.2019 12:38:27 | -19,080 | 837bc1f42db1b5dc3c7e43ff51deb406b44f20a7 | fixing typo in beta dashboard link | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -597,7 +597,7 @@ public class CTABTestController {\nfinal String protocol = \"wss\";\nfinal String dashboardDomain = DASHBOARD_URL;\nString region = config.getAccountRegion() != null ? config.getAccountRegion() : DEFAULT_REGION;\n- region = config.isBeta() ? region+\"-dashaboard-beta\" : region;\n+ region = config.isBeta() ? region+\"-dashboard-beta\" : region;\nfinal String domain = region + \".\" + DASHBOARD_URL;\n//final String domain = \"eu1-dashboard-staging-1.dashboard.clevertap.com\"; //Staging link\nfinal String url = protocol+\"://\"+domain+\"/\"+getAccountId()+\"/\"+\"websocket/screenab/sdk?tk=\"+config.getAccountToken();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fixing typo in beta dashboard link |
116,623 | 25.09.2019 15:56:10 | -19,080 | 7d210a9ce3c7ca420b76a9bd186ae5d61d38582c | Final commit post testing | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -596,7 +596,6 @@ public class CTABTestController {\nString region = config.getAccountRegion() != null ? config.getAccountRegion() : DEFAULT_REGION;\nregion = config.isBeta() ? region+\"-dashboard-beta\" : region;\nfinal String domain = region + \".\" + DASHBOARD_URL;\n- //final String domain = \"eu1-dashboard-staging-1.dashboard.clevertap.com\"; //Staging link\nfinal String url = protocol+\"://\"+domain+\"/\"+getAccountId()+\"/\"+\"websocket/screenab/sdk?tk=\"+config.getAccountToken();\ngetConfigLogger().verbose(getAccountId(), \"Websocket URL - \" + url);\ntry {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewEdit.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ab_testing/uieditor/ViewEdit.java",
"diff": "@@ -271,13 +271,9 @@ class ViewEdit {\nString klassCanonicalName = klass.getCanonicalName();\nif (klassCanonicalName != null && klassCanonicalName.equals(className)) {\nreturn true;\n- }\n-\n- if (klass == Object.class) {\n+ }else{\nreturn false;\n}\n-\n- klass = klass.getSuperclass();\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Final commit post testing |
116,623 | 25.09.2019 16:15:12 | -19,080 | 3019372e03bac2521fd7f48f4f1c72b1b581f38d | Preparing for release v3.6.0 | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/build.gradle",
"new_path": "AndroidStarter/app/build.gradle",
"diff": "@@ -29,7 +29,7 @@ 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.5.1', ext: 'aar') //CleverTap Android SDK, make sure the AAR file is in the libs folder\n+ implementation (name: 'clevertap-android-sdk-3.6.0', ext: 'aar') //CleverTap Android SDK, make sure the AAR file is in the libs folder\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.5.1.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.5.1.aar",
"diff": "Binary files a/AndroidStarter/app/libs/clevertap-android-sdk-3.5.1.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.6.0.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.6.0.aar",
"diff": "Binary files /dev/null and b/AndroidStarter/app/libs/clevertap-android-sdk-3.6.0.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n+### Version 3.6.0 (September 25, 2019)\n+* Adds support for AB Tests. (in closed Beta)\n+* Adds support for deep link query parameters in InApps.\n+* Deprecated GCM.\n+* Deprecated EventHandler, SessionHandler and DataHandler classes.\n+* Workaround for below Oreo Android OS bug causing ANRs while using Push Amplification.\n+* Bug fixes and performance improvements\n+\n### Version 3.5.1 (May 24, 2019)\n* Removes requirement for Manifest entry to enable automatic recording of Push Notification Viewed event\n* Fixes certain Landscape InApp Notification display issues\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.5.1'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.6.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.5.1', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.6.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.5.1'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.6.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.5.1.aar",
"new_path": "clevertap-android-sdk-3.5.1.aar",
"diff": "Binary files a/clevertap-android-sdk-3.5.1.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "clevertap-android-sdk-3.6.0.aar",
"new_path": "clevertap-android-sdk-3.6.0.aar",
"diff": "Binary files /dev/null and b/clevertap-android-sdk-3.6.0.aar differ\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Preparing for release v3.6.0 |
116,623 | 09.10.2019 12:39:07 | -19,080 | 18c03936b9d1bd20217b3c56a0506f0fcce59055 | Handling inbox methods to prevent NPE crashes before inbox initializes | [
{
"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": "@@ -6452,7 +6452,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn inboxMessageArrayList;\n} else {\ngetConfigLogger().debug(getAccountId(),\"Notification Inbox not initialized\");\n- return null;\n+ return inboxMessageArrayList; //return empty list to avoid null pointer exceptions\n}\n}\n}\n@@ -6474,7 +6474,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn inboxMessageArrayList;\n}else{\ngetConfigLogger().debug(getAccountId(),\"Notification Inbox not initialized\");\n- return null;\n+ return inboxMessageArrayList; //return empty list to avoid null pointer exceptions\n}\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Handling inbox methods to prevent NPE crashes before inbox initializes |
116,623 | 09.10.2019 12:41:01 | -19,080 | 166236cc7bb20f67bf2cd0a09481dfec6f402219 | Fixing the bug where inbox timestamp was miscalculated after 48 hours | [
{
"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": "@@ -83,7 +83,7 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\n}else {\n@SuppressLint(\"SimpleDateFormat\")\nSimpleDateFormat sdf = new SimpleDateFormat(\"dd MMM\");\n- return sdf.format(new Date(time));\n+ return sdf.format(new Date(time*1000L));\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fixing the bug where inbox timestamp was miscalculated after 48 hours |
116,621 | 15.10.2019 13:47:01 | -19,080 | 3a0a6db93bc12cc8a0b7afe607476eef652573bd | Android: Click listener in App Inbox
JIRA ID:https://wizrocket.atlassian.net/browse/CLEVER-736 | [
{
"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": "@@ -9,6 +9,8 @@ import android.widget.Toast;\nimport org.json.JSONObject;\n+import java.util.HashMap;\n+\n/**\n* Custom OnClickListener to handle both \"onMessage\" and \"onLink\" clicks\n*/\n@@ -52,7 +54,13 @@ class CTInboxButtonClickListener implements View.OnClickListener {\ncopyToClipboard(fragment.getActivity());\n}\n}\n- fragment.handleClick(this.position, buttonText, buttonObject, inboxMessage.getInboxMessageContents().get(0).getLinkKeyValue(buttonObject));\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}\n} else {\nif (fragment != null) {\n"
},
{
"change_type": "RENAME",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxPayloadListener.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxButtonListener.java",
"diff": "@@ -2,7 +2,7 @@ package com.clevertap.android.sdk;\nimport java.util.HashMap;\n-public interface CTInboxPayloadListener {\n+public interface CTInboxButtonListener {\n/**\n* callback to transfer payload when inbox button is clicked\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": "@@ -113,7 +113,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@SuppressWarnings({\"FieldCanBeLocal\", \"unused\"})\nprivate static String sdkVersion; // For Google Play Store/Android Studio analytics\n- private WeakReference<CTInboxPayloadListener> inboxPayloadListener;\n+ private WeakReference<CTInboxButtonListener> inboxButtonListenerWeakReference;\n// Initialize\nprivate CleverTapAPI(final Context context, final CleverTapInstanceConfig config, String cleverTapID) {\n@@ -238,6 +238,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nstatic void onActivityCreated(Activity activity) {\nonActivityCreated(activity, null);\n}\n+\nprivate DeviceInfo deviceInfo;\nprivate DevicePushTokenRefreshListener tokenRefreshListener;\nprivate boolean appLaunchPushed = false;\n@@ -1501,12 +1502,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//Network Info handling\n- public WeakReference<CTInboxPayloadListener> getInboxPayloadListener() {\n- return inboxPayloadListener;\n- }\n-\n- public void setInboxPayloadListener(WeakReference<CTInboxPayloadListener> inboxPayloadListener) {\n- this.inboxPayloadListener = inboxPayloadListener;\n+ public void setInboxPayloadListener(CTInboxButtonListener inboxButtonListener) {\n+ this.inboxButtonListenerWeakReference = new WeakReference<>(inboxButtonListener);\n}\nprivate Logger getConfigLogger() {\n@@ -6621,9 +6618,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@Override\npublic void messageDidClick(CTInboxActivity ctInboxActivity, CTInboxMessage inboxMessage, Bundle data, HashMap<String, String> keyValue) {\n- if (keyValue != null) {\n- if (inboxPayloadListener != null && inboxPayloadListener.get() != null) {\n- inboxPayloadListener.get().onClick(keyValue);\n+ if (keyValue != null && !keyValue.isEmpty()) {\n+ if (inboxButtonListenerWeakReference != null && inboxButtonListenerWeakReference.get() != null) {\n+ inboxButtonListenerWeakReference.get().onClick(keyValue);\n}\n} else {\npushInboxMessageStateEvent(true, inboxMessage, data);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Android: Click listener in App Inbox
JIRA ID:https://wizrocket.atlassian.net/browse/CLEVER-736 |
116,621 | 15.10.2019 18:34:32 | -19,080 | ca63167e7913f93ba4643ef83c78a1fc4bbf1d7b | Android: Click listener in InApp
JIRA ID:https://wizrocket.atlassian.net/browse/CLEVER-736 | [
{
"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": "@@ -134,10 +134,11 @@ class CTInAppNotificationButton implements Parcelable {\nthis.actionUrl = action;\n}\n}\n- if (Constants.KEY_KV.equalsIgnoreCase(text) && actions != null) {\n- JSONObject keyValues = actions.has(Constants.KEY_KV) ? actions.getJSONObject(Constants.KEY_KV) : null;\n+ if (actions != null && actions.has(Constants.KEY_KV)) {\n+ JSONObject keyValues = actions.getJSONObject(Constants.KEY_KV);\nif (keyValues != null) {\nIterator<String> keys = keyValues.keys();\n+ if (keys != null) {\nString key, value;\nwhile (keys.hasNext()) {\nkey = keys.next();\n@@ -148,6 +149,7 @@ class CTInAppNotificationButton implements Parcelable {\n}\n}\n}\n+ }\n} catch (JSONException e) {\nthis.error = \"Invalid JSON\";\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Android: Click listener in InApp
JIRA ID:https://wizrocket.atlassian.net/browse/CLEVER-736 |
116,621 | 15.10.2019 19:51:30 | -19,080 | a9d5ff336d004cb72671b7e6a95e0fefcbac4a5d | Android: Click listener in InApp & App Inbox
JIRA ID:https://wizrocket.atlassian.net/browse/CLEVER-736 | [
{
"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": "@@ -113,7 +113,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@SuppressWarnings({\"FieldCanBeLocal\", \"unused\"})\nprivate static String sdkVersion; // For Google Play Store/Android Studio analytics\n- private WeakReference<InAppButtonListener> inAppButtonListenerWeakReference;\n+ private WeakReference<InAppNotificationButtonListener> inAppNotificationButtonListener;\n+\n+ private WeakReference<InboxMessageButtonListener> inboxMessageButtonListener;\n// Initialize\nprivate CleverTapAPI(final Context context, final CleverTapInstanceConfig config, String cleverTapID) {\n@@ -1543,8 +1545,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn config;\n}\n- public void setInAppButtonListener(InAppButtonListener inAppButtonListener) {\n- this.inAppButtonListenerWeakReference = new WeakReference<>(inAppButtonListener);\n+ public void setInAppNotificationButtonListener(InAppNotificationButtonListener listener) {\n+ this.inAppNotificationButtonListener = new WeakReference<>(listener);\n+ }\n+\n+ public void setInboxMessageButtonListener(InboxMessageButtonListener listener) {\n+ this.inboxMessageButtonListener = new WeakReference<>(listener);\n}\nprivate Logger getConfigLogger() {\n@@ -5639,8 +5645,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@Override\npublic void inAppNotificationDidClick(Context context, CTInAppNotification inAppNotification, Bundle formData, HashMap<String, String> keyValueMap) {\nif (keyValueMap != null && !keyValueMap.isEmpty()) {\n- if (inAppButtonListenerWeakReference != null && inAppButtonListenerWeakReference.get() != null) {\n- inAppButtonListenerWeakReference.get().onClick(keyValueMap);\n+ if (inAppNotificationButtonListener != null && inAppNotificationButtonListener.get() != null) {\n+ inAppNotificationButtonListener.get().onInAppButtonClick(keyValueMap);\n}\n} else {\npushInAppNotificationStateEvent(true, inAppNotification, formData);\n@@ -6621,10 +6627,15 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n@Override\n- public void messageDidClick(CTInboxActivity ctInboxActivity, CTInboxMessage inboxMessage, Bundle data) {\n+ public void messageDidClick(CTInboxActivity ctInboxActivity, CTInboxMessage inboxMessage, Bundle data, HashMap<String, String> keyValue) {\n+ if (keyValue != null && !keyValue.isEmpty()) {\n+ if (inboxMessageButtonListener != null && inboxMessageButtonListener.get() != null) {\n+ inboxMessageButtonListener.get().onInboxButtonClick(keyValue);\n+ }\n+ } else {\npushInboxMessageStateEvent(true, inboxMessage, data);\n}\n-\n+ }\nprivate void createAlarmScheduler(Context context) {\nint pingFrequency = getPingFrequency(context);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationButtonListener.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppNotificationButtonListener.java",
"diff": "@@ -2,12 +2,12 @@ package com.clevertap.android.sdk;\nimport java.util.HashMap;\n-public interface InAppButtonListener {\n+public interface InAppNotificationButtonListener {\n/**\n* Callback to return a Key Value payload associated with inApp widget click.\n*\n* @param payload\n*/\n- void onClick(HashMap<String, String> payload);\n+ void onInAppButtonClick(HashMap<String, String> payload);\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InboxMessageButtonListener.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InboxMessageButtonListener.java",
"diff": "@@ -2,10 +2,10 @@ package com.clevertap.android.sdk;\nimport java.util.HashMap;\n-public interface CTInboxButtonListener {\n+public interface InboxMessageButtonListener {\n/**\n* callback to transfer payload when inbox button is clicked\n*/\n- void onClick(HashMap<String, String> payload);\n+ void onInboxButtonClick(HashMap<String, String> payload);\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Android: Click listener in InApp & App Inbox
JIRA ID:https://wizrocket.atlassian.net/browse/CLEVER-736 |
116,621 | 16.10.2019 12:50:51 | -19,080 | 2da2ca40fbb68ce1b034e3505548516c9a41f6ca | Android: Click listener changes for App Inbox
JIRA ID:https://wizrocket.atlassian.net/browse/CLEVER-736 | [
{
"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": "@@ -3,6 +3,7 @@ package com.clevertap.android.sdk;\nimport android.os.Parcel;\nimport android.os.Parcelable;\n+import android.text.TextUtils;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n@@ -143,6 +144,7 @@ class CTInAppNotificationButton implements Parcelable {\nwhile (keys.hasNext()) {\nkey = keys.next();\nvalue = keyValues.getString(key);\n+ if (!TextUtils.isEmpty(key)) {\nif (this.keyValues == null)\nthis.keyValues = new HashMap<>();\nthis.keyValues.put(key, value);\n@@ -150,6 +152,7 @@ class CTInAppNotificationButton implements Parcelable {\n}\n}\n}\n+ }\n} catch (JSONException e) {\nthis.error = \"Invalid JSON\";\n}\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": "@@ -195,9 +195,9 @@ public class CTInboxListViewFragment extends Fragment {\ndata.putString(\"wzrk_c2a\", buttonText);\n}\ndidClick(data, position, keyValuePayload);\n-\n+ boolean isKVButton = keyValuePayload != null && !keyValuePayload.isEmpty();\nif (jsonObject != null) {\n- if(inboxMessages.get(position).getInboxMessageContents().get(0).getLinktype(jsonObject).equalsIgnoreCase(Constants.COPY_TYPE)){\n+ if (isKVButton || inboxMessages.get(position).getInboxMessageContents().get(0).getLinktype(jsonObject).equalsIgnoreCase(Constants.COPY_TYPE)) {\n//noinspection UnnecessaryReturnStatement\nreturn;\n} else {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxMessageContent.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxMessageContent.java",
"diff": "@@ -9,6 +9,7 @@ import org.json.JSONException;\nimport org.json.JSONObject;\nimport java.util.HashMap;\n+import java.util.Iterator;\n/**\n* Public model class for the \"msg\" object from notification inbox payload\n@@ -371,27 +372,23 @@ public class CTInboxMessageContent implements Parcelable {\n* @return\n*/\npublic HashMap<String, String> getLinkKeyValue(JSONObject jsonObject) {\n- if (jsonObject == null) return null;\n+ if (jsonObject == null || !jsonObject.has(Constants.KEY_KV)) return null;\ntry {\n- JSONArray keyValueArr = jsonObject.has(\"kv\") ? jsonObject.getJSONArray(\"kv\") : null;\n- if (keyValueArr != null && keyValueArr.length() > 0) {\n- JSONObject kvobj, valueObj;\n+ JSONObject keyValues = jsonObject.getJSONObject(Constants.KEY_KV);\n+ if (keyValues != null) {\n+ Iterator<String> keys = keyValues.keys();\n+ HashMap<String, String> keyValuesMap = new HashMap<>();\n+ if (keys != null) {\nString key, value;\n- HashMap<String, String> map = new HashMap<>();\n- for (int i = 0; i < keyValueArr.length(); i++) {\n- kvobj = keyValueArr.getJSONObject(0);\n- if (kvobj != null) {\n- key = kvobj.getString(\"key\");\n- valueObj = kvobj.getJSONObject(\"value\");\n- if (!TextUtils.isEmpty(key) && valueObj != null) {\n- value = valueObj.getString(\"text\");\n- if (!TextUtils.isEmpty(value)) {\n- map.put(key, value);\n- }\n+ while (keys.hasNext()) {\n+ key = keys.next();\n+ value = keyValues.getString(key);\n+ if (!TextUtils.isEmpty(key)) {\n+ keyValuesMap.put(key, value);\n}\n}\n}\n- return !map.isEmpty() ? map : null;\n+ return !keyValuesMap.isEmpty() ? keyValuesMap : null;\n} else {\nreturn null;\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": "@@ -240,6 +240,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nstatic void onActivityCreated(Activity activity) {\nonActivityCreated(activity, null);\n}\n+\nprivate DeviceInfo deviceInfo;\nprivate DevicePushTokenRefreshListener tokenRefreshListener;\nprivate boolean appLaunchPushed = false;\n@@ -5644,12 +5645,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@Override\npublic void inAppNotificationDidClick(Context context, CTInAppNotification inAppNotification, Bundle formData, HashMap<String, String> keyValueMap) {\n+ pushInAppNotificationStateEvent(true, inAppNotification, formData);\nif (keyValueMap != null && !keyValueMap.isEmpty()) {\nif (inAppNotificationButtonListener != null && inAppNotificationButtonListener.get() != null) {\ninAppNotificationButtonListener.get().onInAppButtonClick(keyValueMap);\n}\n- } else {\n- pushInAppNotificationStateEvent(true, inAppNotification, formData);\n}\n}\n@@ -6628,12 +6628,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@Override\npublic void messageDidClick(CTInboxActivity ctInboxActivity, CTInboxMessage inboxMessage, Bundle data, HashMap<String, String> keyValue) {\n+ pushInboxMessageStateEvent(true, inboxMessage, data);\nif (keyValue != null && !keyValue.isEmpty()) {\nif (inboxMessageButtonListener != null && inboxMessageButtonListener.get() != null) {\ninboxMessageButtonListener.get().onInboxButtonClick(keyValue);\n}\n- } else {\n- pushInboxMessageStateEvent(true, inboxMessage, data);\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Android: Click listener changes for App Inbox
JIRA ID:https://wizrocket.atlassian.net/browse/CLEVER-736 |
116,621 | 16.10.2019 21:44:35 | -19,080 | ce86ae86cee6493c8555328dd933f98fe958e4f9 | Android SDK Release V3.6.1 | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/build.gradle",
"new_path": "AndroidStarter/app/build.gradle",
"diff": "@@ -29,7 +29,7 @@ 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.0', ext: 'aar') //CleverTap Android SDK, make sure the AAR file is in the libs folder\n+ implementation (name: 'clevertap-android-sdk-3.6.1', ext: 'aar') //CleverTap Android SDK, make sure the AAR file is in the libs folder\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.0.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.6.0.aar",
"diff": "Binary files a/AndroidStarter/app/libs/clevertap-android-sdk-3.6.0.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"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 /dev/null and b/AndroidStarter/app/libs/clevertap-android-sdk-3.6.1.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n+### Version 3.6.1 (October 16, 2019)\n+* Bug fixes and performance improvements\n+\n### Version 3.6.0 (September 25, 2019)\n* Adds support for AB Tests. (in closed Beta)\n* Adds support for deep link query parameters in InApps.\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.0'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.6.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.6.0', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.6.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.6.0'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.6.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.6.0.aar",
"new_path": "clevertap-android-sdk-3.6.0.aar",
"diff": "Binary files a/clevertap-android-sdk-3.6.0.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "clevertap-android-sdk-3.6.1.aar",
"new_path": "clevertap-android-sdk-3.6.1.aar",
"diff": "Binary files /dev/null and b/clevertap-android-sdk-3.6.1.aar differ\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Android SDK Release V3.6.1 |
116,621 | 12.11.2019 14:06:53 | -19,080 | 6a85fa4bac19874981ee016b1f8a9b869c9348d6 | 1. Implmented Adunit Controller
2. Adunit model
3. Parsing logic
4. Test ad notification logic
5. Record Viewed & Clicked Event | [
{
"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.1'\n+ libraryVersion = '3.6.2'\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=\"30601\"\n- android:versionName=\"3.6.1\">\n+ android:versionCode=\"30602\"\n+ android:versionName=\"3.6.2\">\n<application>\n<receiver\nandroid:name=\"com.clevertap.android.sdk.InstallReferrerBroadcastReceiver\"\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": "@@ -43,6 +43,9 @@ import android.text.TextUtils;\nimport com.clevertap.android.sdk.ab_testing.CTABTestController;\nimport com.clevertap.android.sdk.ab_testing.CTABTestListener;\n+import com.clevertap.android.sdk.ads.AdListener;\n+import com.clevertap.android.sdk.ads.AdUnitController;\n+import com.clevertap.android.sdk.ads.CTAdUnit;\nimport com.google.android.gms.plus.model.people.Person;\nimport com.google.firebase.iid.FirebaseInstanceId;\nimport com.google.firebase.messaging.FirebaseMessaging;\n@@ -117,6 +120,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate WeakReference<InboxMessageButtonListener> inboxMessageButtonListener;\n+ private WeakReference<AdListener> adListenerWeakReference;\n+\n// Initialize\nprivate CleverTapAPI(final Context context, final CleverTapInstanceConfig config, String cleverTapID) {\nthis.config = new CleverTapInstanceConfig(config);\n@@ -273,8 +278,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate CTABTestController ctABTestController;\nprivate CTExperimentsListener experimentsListener = null;\nprivate final Object inboxControllerLock = new Object();\n+ private final Object adControllerLock = new Object();\nprivate CTInboxListener inboxListener;\nprivate boolean isBgPing = false;\n+ private AdUnitController mAdController;\n// static lifecycle callbacks\nstatic void onActivityCreated(Activity activity, String cleverTapID) {\n@@ -3242,6 +3249,16 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n+ //Handle AdUnit response\n+ if (!getConfig().isAnalyticsOnly()) {\n+ try {\n+ getConfigLogger().verbose(getAccountId(), \"Processing adUnit items...\");\n+ processAdUnitsResponse(response);\n+ } catch (Throwable t) {\n+ getConfigLogger().verbose(\"Error handling AdUnit response: \" + t.getLocalizedMessage());\n+ }\n+ }\n+\n} catch (Throwable t) {\nmResponseFailureCount++;\ngetConfigLogger().verbose(getAccountId(), \"Problem process send queue response\", t);\n@@ -4978,6 +4995,27 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn;\n}\n+ if (extras.containsKey(Constants.ADUNIT_PREVIEW_PUSH_PAYLOAD_KEY)) {\n+ pendingInappRunnable = new Runnable() {\n+ @Override\n+ public void run() {\n+ try {\n+ Logger.v(\"Received adUnit via push payload: \" + extras.getString(Constants.ADUNIT_PREVIEW_PUSH_PAYLOAD_KEY));\n+ JSONObject r = new JSONObject();\n+ JSONArray adUnits = new JSONArray();\n+ r.put(Constants.ADUNIT_JSON_RESPONSE_KEY, adUnits);\n+ JSONObject testPushObject = new JSONObject(extras.getString(Constants.ADUNIT_PREVIEW_PUSH_PAYLOAD_KEY));\n+ testPushObject.put(\"_id\", String.valueOf(System.currentTimeMillis() / 1000));\n+ adUnits.put(testPushObject);\n+ processAdUnitsResponse(r);\n+ } catch (Throwable t) {\n+ Logger.v(\"Failed to process Ad Unit from push notification payload\", t);\n+ }\n+ }\n+ };\n+ return;\n+ }\n+\nif (!extras.containsKey(Constants.NOTIFICATION_ID_TAG) || (extras.getString(Constants.NOTIFICATION_ID_TAG) == null)) {\ngetConfigLogger().debug(getAccountId(), \"Push notification ID Tag is null, not processing Notification Clicked event for: \" + extras.toString());\nreturn;\n@@ -7320,4 +7358,150 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n+ /**\n+ * -----------------------------------------------------------------------\n+ * ******** AD LOGIC *****\n+ * -----------------------------------------------------------------------/\n+ * <p>\n+ * /**\n+ * logic for the processing of ad response\n+ *\n+ * @param response\n+ */\n+ private 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+ }\n+\n+ getConfigLogger().verbose(getAccountId(), \"Ad: Processing response\");\n+\n+ if (!response.has(Constants.ADUNIT_JSON_RESPONSE_KEY)) {\n+ getConfigLogger().verbose(getAccountId(), \"Ad: Response JSON object doesn't contain the Ad key\");\n+ return;\n+ }\n+ try {\n+ parseAdUnits(response.getJSONArray(Constants.ADUNIT_JSON_RESPONSE_KEY));\n+ } catch (Throwable t) {\n+ getConfigLogger().verbose(getAccountId(), \"AdResponse: Failed to parse response\", t);\n+ }\n+ }\n+\n+ /**\n+ * prepares the ad Units using the JSON response\n+ *\n+ * @param messages\n+ */\n+ private void parseAdUnits(JSONArray messages) {\n+ synchronized (adControllerLock) {\n+ if (mAdController == null) {\n+ mAdController = new AdUnitController();\n+ }\n+ ArrayList<CTAdUnit> adUnits = mAdController.updateAdItems(messages);\n+\n+ notifyAdUnitsLoaded(adUnits);\n+ }\n+ }\n+\n+ /**\n+ * Notify the registered ad listener about the running ad campaigns\n+ *\n+ * @param adUnits\n+ */\n+ private void notifyAdUnitsLoaded(ArrayList<CTAdUnit> adUnits) {\n+ if (adUnits != null && !adUnits.isEmpty()) {\n+ if (adListenerWeakReference != null && adListenerWeakReference.get() != null) {\n+ adListenerWeakReference.get().onAdUnitsLoaded(adUnits);\n+ }\n+ }\n+ }\n+\n+ /**\n+ * Register listener to receive the list of running ad campaign ids\n+ *\n+ * @param adListener\n+ */\n+ public void registerAdListener(@NonNull AdListener adListener) {\n+ if (adListener != null) {\n+ adListenerWeakReference = new WeakReference<>(adListener);\n+ }\n+ }\n+\n+ /**\n+ * API to get the Custom Key Value data associated with an adUnit.\n+ *\n+ * @param adID\n+ * @return\n+ */\n+ public @Nullable\n+ HashMap<String, String> getAdUnitForID(@NonNull String adID) {\n+ if (mAdController != null) {\n+ mAdController.getAdUnitForID(adID);\n+ }\n+ return null;\n+ }\n+\n+ /**\n+ * Raises the Ad Unit Viewed event\n+ *\n+ * @param adID - Unique id of the Ad Unit\n+ */\n+ @SuppressWarnings({\"unused\", \"WeakerAccess\"})\n+ public void recordAdUnitViewedEventForID(String adID) {\n+ JSONObject event = new JSONObject();\n+\n+ try {\n+\n+ event.put(\"evtName\", Constants.NOTIFICATION_VIEWED_EVENT_NAME);\n+\n+ //wzrk fields\n+ if (mAdController != null) {\n+ CTAdUnit adUnit = mAdController.getAdUnitForID(adID);\n+ if (adUnit != null) {\n+ JSONObject eventExtras = adUnit.getWzrkFields();\n+ if (eventExtras != null) {\n+ event.put(\"evtData\", eventExtras);\n+ }\n+ }\n+ }\n+\n+ queueEvent(context, event, Constants.RAISED_EVENT);\n+ } catch (Throwable ignored) {\n+ // We won't get here\n+ }\n+ }\n+\n+ /**\n+ * Raises the Ad Unit Clicked event\n+ *\n+ * @param adID - Unique id of the Ad Unit\n+ */\n+ @SuppressWarnings({\"unused\", \"WeakerAccess\"})\n+ public void recordAdUnitClickedEventForID(String adID) {\n+ JSONObject event = new JSONObject();\n+\n+ try {\n+ event.put(\"evtName\", Constants.NOTIFICATION_CLICKED_EVENT_NAME);\n+\n+ //wzrk fields\n+ if (mAdController != null) {\n+ CTAdUnit adUnit = mAdController.getAdUnitForID(adID);\n+ if (adUnit != null) {\n+ JSONObject eventExtraData = adUnit.getWzrkFields();\n+ if (eventExtraData != null) {\n+ event.put(\"evtData\", eventExtraData);\n+ try {\n+ setWzrkParams(eventExtraData);\n+ } catch (Throwable t) {\n+ // no-op\n+ }\n+ }\n+ }\n+ }\n+\n+ queueEvent(context, event, Constants.RAISED_EVENT);\n+ } catch (Throwable ignored) {\n+ // We won't get here\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": "@@ -42,6 +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\";\nstatic final String INAPP_HTML_TAG = \"html\";\nstatic final String INAPP_DATA_TAG = \"d\";\nstatic final String INAPP_X_PERCENT = \"xp\";\n@@ -58,6 +59,7 @@ public class Constants {\nstatic final String INAPP_NOTIF_SHOW_CLOSE = \"sc\";\nstatic final String INAPP_JSON_RESPONSE_KEY = \"inapp_notifs\";\nstatic final String INBOX_JSON_RESPONSE_KEY = \"inbox_notifs\";\n+ static final String ADUNIT_JSON_RESPONSE_KEY = \"adUnit_notifs\";\nstatic final String INAPP_MAX_DISPLAY_COUNT = \"mdc\";\nstatic final String INAPP_MAX_PER_SESSION = \"imc\";\nstatic final String INAPP_WINDOW = \"w\";\n@@ -66,7 +68,7 @@ public class Constants {\nstatic final String INAPP_JS_ENABLED = \"isJsEnabled\";\nstatic final String NOTIFICATION_ID_TAG = \"wzrk_id\";\nstatic final String DEEP_LINK_KEY = \"wzrk_dl\";\n- static final String WZRK_PREFIX = \"wzrk_\";\n+ public static final String WZRK_PREFIX = \"wzrk_\";\nstatic final int NOTIFICATION_ID_TAG_INTERVAL = 5000;\nstatic final int NOTIFICATION_VIEWED_ID_TAG_INTERVAL = 2000;\nstatic final String SESSION_ID_LAST = \"lastSessionId\";\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/AdListener.java",
"diff": "+package com.clevertap.android.sdk.ads;\n+\n+import java.util.ArrayList;\n+\n+/**\n+ * Listener for Ad Unit Callbacks\n+ */\n+public interface AdListener {\n+\n+ /**\n+ * Provides the list of currently running ad campaigns\n+ *\n+ * @param units - list of ad units\n+ */\n+ void onAdUnitsLoaded(ArrayList<CTAdUnit> units);\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/AdUnitController.java",
"diff": "+package com.clevertap.android.sdk.ads;\n+\n+import android.text.TextUtils;\n+\n+import com.clevertap.android.sdk.Logger;\n+\n+import org.json.JSONArray;\n+import org.json.JSONObject;\n+\n+import java.util.ArrayList;\n+import java.util.HashMap;\n+\n+/**\n+ * Controller class for caching & supplying the Ad Units to the client.\n+ */\n+public class AdUnitController {\n+\n+ private final HashMap<String, CTAdUnit> items = new HashMap<>();\n+\n+ /**\n+ * Replaces the old AdUnits with the new ones post transformation of Json objects to AdUnit objects\n+ *\n+ * @param messages\n+ * @return\n+ */\n+ public ArrayList<CTAdUnit> updateAdItems(JSONArray messages) {\n+ items.clear();\n+\n+ if (messages != null && messages.length() > 0) {\n+ final ArrayList<CTAdUnit> list = new ArrayList<>();\n+ try {\n+ for (int i = 0; i < messages.length(); i++) {\n+ //parse each ad Unit\n+ CTAdUnit item = CTAdUnit.toAdUnit((JSONObject) messages.get(i));\n+ if (item != null && !TextUtils.isEmpty(item.getError())) {\n+ items.put(item.getAdID(), item);\n+ list.add(item);\n+ } else {\n+ Logger.v(\"Failed to convert JsonArray item at index:\" + i + \" to AdUnit\");\n+ }\n+ }\n+ } catch (Exception e) {\n+ Logger.v(\"Failed while parsing Ad Unit:\" + e.getLocalizedMessage());\n+ return null;\n+ }\n+\n+ return !list.isEmpty() ? list : null;\n+ }\n+\n+ return null;\n+ }\n+\n+ /**\n+ * API to get the AdUnit using the adID\n+ *\n+ * @param adID\n+ * @return\n+ */\n+ public CTAdUnit getAdUnitForID(String adID) {\n+ if (!TextUtils.isEmpty(adID)) {\n+ return items.get(adID);\n+ }\n+ return null;\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/CTAdUnit.java",
"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"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | 1. Implmented Adunit Controller
2. Adunit model
3. Parsing logic
4. Test ad notification logic
5. Record Viewed & Clicked Event |
116,621 | 21.11.2019 12:24:40 | -19,080 | 1634abbf404026b2aa1e4528f83abcc3086416f4 | updated gradle config for auto renaming of aar files using build config. | [
{
"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.0.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.6.2.0\"'\n}\nrelease {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.6.0.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.6.2.0\"'\nminifyEnabled false\nproguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'\n}\n@@ -70,6 +70,15 @@ android {\nlintOptions {\nabortOnError false\n}\n+ libraryVariants.all { variant ->\n+ variant.outputs.all {\n+ if (variant.getName().toLowerCase().contains('release')) {\n+ outputFileName = \"${artifact}-${libraryVersion}.aar\"\n+ } else if (variant.getName().toLowerCase().contains('debug')) {\n+ outputFileName = \"${artifact}-${variant.name}-${libraryVersion}.aar\"\n+ }\n+ }\n+ }\n}\nProperties properties = new Properties()\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | updated gradle config for auto renaming of aar files using build config. |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.