open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
3afe0113 1 parent 58fafc42

minor fixes, added trackers

Inline Side-by-side
Showing 24 changed files with 133 additions and 13 deletions
...@@ -36,7 +36,7 @@ public class SplashActivity extends BaseActivity { ...@@ -36,7 +36,7 @@ public class SplashActivity extends BaseActivity {
36 public void onWarplyReady() { 36 public void onWarplyReady() {
37 if (!WarplyDBHelper.getInstance(SplashActivity.this).isTableNotEmpty("auth")) { 37 if (!WarplyDBHelper.getInstance(SplashActivity.this).isTableNotEmpty("auth")) {
38 WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest() 38 WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest()
39 - .setGuid("7000000831"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons 39 + .setGuid("6006552990"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons, prod 6006552990
40 mLoginReceiver); 40 mLoginReceiver);
41 } else { 41 } else {
42 startNextActivity(); 42 startNextActivity();
......
...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library' ...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
2 2
3 ext { 3 ext {
4 PUBLISH_GROUP_ID = 'ly.warp' 4 PUBLISH_GROUP_ID = 'ly.warp'
5 - PUBLISH_VERSION = '4.5.4-cosbeta81' 5 + PUBLISH_VERSION = '4.5.4-cosbeta85'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
......
...@@ -165,11 +165,11 @@ ...@@ -165,11 +165,11 @@
165 android:exported="false" 165 android:exported="false"
166 android:permission="android.permission.BIND_JOB_SERVICE" /> 166 android:permission="android.permission.BIND_JOB_SERVICE" />
167 167
168 +<!-- android:stopWithTask="false"-->
169 +<!-- android:process=":warplyHealthService"-->
168 <service 170 <service
169 android:name="ly.warp.sdk.services.WarplyHealthService" 171 android:name="ly.warp.sdk.services.WarplyHealthService"
170 android:exported="false" 172 android:exported="false"
171 - android:stopWithTask="false"
172 - android:process=":warplyHealthService"
173 android:permission="android.permission.BIND_JOB_SERVICE" /> 173 android:permission="android.permission.BIND_JOB_SERVICE" />
174 174
175 <service 175 <service
......
...@@ -22,6 +22,7 @@ import io.github.inflationx.viewpump.ViewPumpContextWrapper; ...@@ -22,6 +22,7 @@ import io.github.inflationx.viewpump.ViewPumpContextWrapper;
22 import ly.warp.sdk.R; 22 import ly.warp.sdk.R;
23 import ly.warp.sdk.io.models.Coupon; 23 import ly.warp.sdk.io.models.Coupon;
24 import ly.warp.sdk.io.models.CouponList; 24 import ly.warp.sdk.io.models.CouponList;
25 +import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
25 import ly.warp.sdk.views.adapters.ActiveCouponAdapter; 26 import ly.warp.sdk.views.adapters.ActiveCouponAdapter;
26 27
27 28
...@@ -83,6 +84,7 @@ public class ActiveCouponsActivity extends Activity implements View.OnClickListe ...@@ -83,6 +84,7 @@ public class ActiveCouponsActivity extends Activity implements View.OnClickListe
83 mRecyclerCoupons.setAdapter(mAdapterCoupons); 84 mRecyclerCoupons.setAdapter(mAdapterCoupons);
84 mAdapterCoupons.getPositionClicks() 85 mAdapterCoupons.getPositionClicks()
85 .doOnNext(coupon -> { 86 .doOnNext(coupon -> {
87 + WarplyAnalyticsManager.logTrackersEvent("click", ("Coupon").concat(":").concat(coupon.getName()));
86 Intent intent = new Intent(ActiveCouponsActivity.this, CouponInfoActivity.class); 88 Intent intent = new Intent(ActiveCouponsActivity.this, CouponInfoActivity.class);
87 intent.putExtra("coupon", (Serializable) coupon); 89 intent.putExtra("coupon", (Serializable) coupon);
88 startActivity(intent); 90 startActivity(intent);
...@@ -100,6 +102,7 @@ public class ActiveCouponsActivity extends Activity implements View.OnClickListe ...@@ -100,6 +102,7 @@ public class ActiveCouponsActivity extends Activity implements View.OnClickListe
100 @Override 102 @Override
101 public void onResume() { 103 public void onResume() {
102 super.onResume(); 104 super.onResume();
105 + WarplyAnalyticsManager.logTrackersEvent("screen", "ActiveCouponsScreen");
103 } 106 }
104 107
105 @Override 108 @Override
......
...@@ -19,6 +19,7 @@ import ly.warp.sdk.io.models.Coupon; ...@@ -19,6 +19,7 @@ import ly.warp.sdk.io.models.Coupon;
19 import ly.warp.sdk.io.models.CouponList; 19 import ly.warp.sdk.io.models.CouponList;
20 import ly.warp.sdk.io.models.MergedActiveGifts; 20 import ly.warp.sdk.io.models.MergedActiveGifts;
21 import ly.warp.sdk.utils.WarplyManagerHelper; 21 import ly.warp.sdk.utils.WarplyManagerHelper;
22 +import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
22 import ly.warp.sdk.views.adapters.MergedActiveGiftsAdapter; 23 import ly.warp.sdk.views.adapters.MergedActiveGiftsAdapter;
23 24
24 25
...@@ -60,6 +61,7 @@ public class ActiveGiftsActivity extends Activity implements View.OnClickListene ...@@ -60,6 +61,7 @@ public class ActiveGiftsActivity extends Activity implements View.OnClickListene
60 @Override 61 @Override
61 public void onResume() { 62 public void onResume() {
62 super.onResume(); 63 super.onResume();
64 + WarplyAnalyticsManager.logTrackersEvent("screen", "ActiveGiftsScreen");
63 } 65 }
64 66
65 @Override 67 @Override
......
...@@ -30,6 +30,7 @@ import ly.warp.sdk.io.models.LoyaltyContextualOfferModel; ...@@ -30,6 +30,7 @@ import ly.warp.sdk.io.models.LoyaltyContextualOfferModel;
30 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel; 30 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
31 import ly.warp.sdk.io.request.CosmoteSubmitOrderRequest; 31 import ly.warp.sdk.io.request.CosmoteSubmitOrderRequest;
32 import ly.warp.sdk.io.request.WarplyConsumerRequest; 32 import ly.warp.sdk.io.request.WarplyConsumerRequest;
33 +import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
33 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 34 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
34 import ly.warp.sdk.utils.managers.WarplyManager; 35 import ly.warp.sdk.utils.managers.WarplyManager;
35 36
...@@ -77,6 +78,7 @@ public class ContextualActivity extends Activity implements View.OnClickListener ...@@ -77,6 +78,7 @@ public class ContextualActivity extends Activity implements View.OnClickListener
77 @Override 78 @Override
78 public void onResume() { 79 public void onResume() {
79 super.onResume(); 80 super.onResume();
81 + WarplyAnalyticsManager.logTrackersEvent("screen", "ContextualScreen");
80 82
81 // new Thread(() -> { 83 // new Thread(() -> {
82 // if (!Thread.currentThread().isInterrupted()) { 84 // if (!Thread.currentThread().isInterrupted()) {
...@@ -185,6 +187,10 @@ public class ContextualActivity extends Activity implements View.OnClickListener ...@@ -185,6 +187,10 @@ public class ContextualActivity extends Activity implements View.OnClickListener
185 } 187 }
186 188
187 private void activateGift() { 189 private void activateGift() {
190 + WarplyAnalyticsManager.logTrackersEvent("click", ("ActivateContextual")
191 + .concat(":")
192 + .concat(mCCMS.getSessionId()));
193 +
188 new Thread(() -> { 194 new Thread(() -> {
189 if (!Thread.currentThread().isInterrupted()) { 195 if (!Thread.currentThread().isInterrupted()) {
190 WarplyManager.submitOrder(new CosmoteSubmitOrderRequest() 196 WarplyManager.submitOrder(new CosmoteSubmitOrderRequest()
......
...@@ -35,6 +35,7 @@ import ly.warp.sdk.io.models.Coupon; ...@@ -35,6 +35,7 @@ import ly.warp.sdk.io.models.Coupon;
35 import ly.warp.sdk.io.models.Couponset; 35 import ly.warp.sdk.io.models.Couponset;
36 import ly.warp.sdk.services.EventCouponsService; 36 import ly.warp.sdk.services.EventCouponsService;
37 import ly.warp.sdk.utils.WarplyManagerHelper; 37 import ly.warp.sdk.utils.WarplyManagerHelper;
38 +import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
38 39
39 40
40 public class CouponInfoActivity extends Activity implements View.OnClickListener { 41 public class CouponInfoActivity extends Activity implements View.OnClickListener {
...@@ -89,6 +90,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -89,6 +90,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
89 @Override 90 @Override
90 public void onResume() { 91 public void onResume() {
91 super.onResume(); 92 super.onResume();
93 + WarplyAnalyticsManager.logTrackersEvent("screen", "CouponScreen");
92 } 94 }
93 95
94 @Override 96 @Override
...@@ -109,6 +111,10 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -109,6 +111,10 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
109 return; 111 return;
110 } 112 }
111 if (view.getId() == R.id.ll_gift_it) { 113 if (view.getId() == R.id.ll_gift_it) {
114 + WarplyAnalyticsManager.logTrackersEvent("click", ("ShareCoupon")
115 + .concat(":")
116 + .concat(mCoupon.getName()));
117 +
112 Intent intent = new Intent(CouponInfoActivity.this, CouponShareActivity.class); 118 Intent intent = new Intent(CouponInfoActivity.this, CouponShareActivity.class);
113 intent.putExtra("coupon", (Serializable) mCoupon); 119 intent.putExtra("coupon", (Serializable) mCoupon);
114 intent.putExtra("isFromWallet", mIsFromWallet); 120 intent.putExtra("isFromWallet", mIsFromWallet);
...@@ -119,6 +125,8 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -119,6 +125,8 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
119 return; 125 return;
120 } 126 }
121 if (view.getId() == R.id.ll_shops) { 127 if (view.getId() == R.id.ll_shops) {
128 + WarplyAnalyticsManager.logTrackersEvent("click", "SeeShops");
129 +
122 Intent intent = new Intent(CouponInfoActivity.this, ShopsActivity.class); 130 Intent intent = new Intent(CouponInfoActivity.this, ShopsActivity.class);
123 intent.putExtra("couponset", (Serializable) mCouponset); 131 intent.putExtra("couponset", (Serializable) mCouponset);
124 startActivity(intent); 132 startActivity(intent);
......
...@@ -38,6 +38,7 @@ import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel; ...@@ -38,6 +38,7 @@ import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel;
38 import ly.warp.sdk.io.request.CosmoteCouponSharingRequest; 38 import ly.warp.sdk.io.request.CosmoteCouponSharingRequest;
39 import ly.warp.sdk.io.request.WarplyConsumerRequest; 39 import ly.warp.sdk.io.request.WarplyConsumerRequest;
40 import ly.warp.sdk.io.request.WarplyUserCouponsRequest; 40 import ly.warp.sdk.io.request.WarplyUserCouponsRequest;
41 +import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
41 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 42 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
42 import ly.warp.sdk.utils.managers.WarplyManager; 43 import ly.warp.sdk.utils.managers.WarplyManager;
43 44
...@@ -92,6 +93,7 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -92,6 +93,7 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
92 @Override 93 @Override
93 public void onResume() { 94 public void onResume() {
94 super.onResume(); 95 super.onResume();
96 + WarplyAnalyticsManager.logTrackersEvent("screen", "CouponShareScreen");
95 97
96 new Thread(() -> { 98 new Thread(() -> {
97 if (!Thread.currentThread().isInterrupted()) { 99 if (!Thread.currentThread().isInterrupted()) {
...@@ -278,6 +280,10 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -278,6 +280,10 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
278 .setTitle(R.string.cos_dlg_positive_coupon_title) 280 .setTitle(R.string.cos_dlg_positive_coupon_title)
279 .setMessage(R.string.cos_dlg_positive_coupon_subtitle) 281 .setMessage(R.string.cos_dlg_positive_coupon_subtitle)
280 .setPositiveButton(R.string.cos_dlg_negative_button3, (dialogPositive, whichPositive) -> { 282 .setPositiveButton(R.string.cos_dlg_negative_button3, (dialogPositive, whichPositive) -> {
283 + WarplyAnalyticsManager.logTrackersEvent("click", ("ShareCoupon")
284 + .concat(":")
285 + .concat(mCoupon.getName()));
286 +
281 new Thread(() -> { 287 new Thread(() -> {
282 if (!Thread.currentThread().isInterrupted()) { 288 if (!Thread.currentThread().isInterrupted()) {
283 WarplyManager.cosmoteCouponSharing(new CosmoteCouponSharingRequest() 289 WarplyManager.cosmoteCouponSharing(new CosmoteCouponSharingRequest()
......
...@@ -40,6 +40,7 @@ import ly.warp.sdk.io.request.WarplyUserCouponsRequest; ...@@ -40,6 +40,7 @@ import ly.warp.sdk.io.request.WarplyUserCouponsRequest;
40 import ly.warp.sdk.services.EventCampaignService; 40 import ly.warp.sdk.services.EventCampaignService;
41 import ly.warp.sdk.utils.WarpUtils; 41 import ly.warp.sdk.utils.WarpUtils;
42 import ly.warp.sdk.utils.WarplyManagerHelper; 42 import ly.warp.sdk.utils.WarplyManagerHelper;
43 +import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
43 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 44 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
44 import ly.warp.sdk.utils.managers.WarplyManager; 45 import ly.warp.sdk.utils.managers.WarplyManager;
45 46
...@@ -96,6 +97,7 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe ...@@ -96,6 +97,7 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
96 @Override 97 @Override
97 public void onResume() { 98 public void onResume() {
98 super.onResume(); 99 super.onResume();
100 + WarplyAnalyticsManager.logTrackersEvent("screen", "CouponsetScreen");
99 } 101 }
100 102
101 @Override 103 @Override
...@@ -106,6 +108,9 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe ...@@ -106,6 +108,9 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
106 } 108 }
107 if (view.getId() == R.id.ll_get_gift) { 109 if (view.getId() == R.id.ll_get_gift) {
108 mPbLoading.setVisibility(View.VISIBLE); 110 mPbLoading.setVisibility(View.VISIBLE);
111 + WarplyAnalyticsManager.logTrackersEvent("click", ("RetrieveCoupon")
112 + .concat(":")
113 + .concat(mCouponset.getUuid()));
109 if (mCcms == null) { 114 if (mCcms == null) {
110 WarplyManager.redeemCoupon(new WarplyRedeemCouponRequest() 115 WarplyManager.redeemCoupon(new WarplyRedeemCouponRequest()
111 .setCouponsetUuid(mCouponset.getUuid()) 116 .setCouponsetUuid(mCouponset.getUuid())
......
...@@ -42,6 +42,7 @@ import ly.warp.sdk.services.EventCampaignService; ...@@ -42,6 +42,7 @@ import ly.warp.sdk.services.EventCampaignService;
42 import ly.warp.sdk.utils.WarpJSONParser; 42 import ly.warp.sdk.utils.WarpJSONParser;
43 import ly.warp.sdk.utils.WarpUtils; 43 import ly.warp.sdk.utils.WarpUtils;
44 import ly.warp.sdk.utils.WarplyManagerHelper; 44 import ly.warp.sdk.utils.WarplyManagerHelper;
45 +import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
45 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 46 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
46 import ly.warp.sdk.utils.managers.WarplyManager; 47 import ly.warp.sdk.utils.managers.WarplyManager;
47 import ly.warp.sdk.views.adapters.MergedGiftsAdapter; 48 import ly.warp.sdk.views.adapters.MergedGiftsAdapter;
...@@ -118,6 +119,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -118,6 +119,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
118 @Override 119 @Override
119 public void onResume() { 120 public void onResume() {
120 super.onResume(); 121 super.onResume();
122 + WarplyAnalyticsManager.logTrackersEvent("screen", "GiftsForYouScreen");
121 mTimer = 0; 123 mTimer = 0;
122 mSecondsHandler.post(new Runnable() { 124 mSecondsHandler.post(new Runnable() {
123 @Override 125 @Override
...@@ -262,6 +264,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -262,6 +264,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
262 analyticsEvent.setParameter("type", "coupon"); 264 analyticsEvent.setParameter("type", "coupon");
263 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 265 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
264 266
267 + WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID()));
265 WarplyManager.getSingleCampaign(dataItem.getCampaign().getSessionUUID()); 268 WarplyManager.getSingleCampaign(dataItem.getCampaign().getSessionUUID());
266 Intent intent = new Intent(GiftsForYouActivity.this, CouponsetInfoActivity.class); 269 Intent intent = new Intent(GiftsForYouActivity.this, CouponsetInfoActivity.class);
267 intent.putExtra("couponset", (Serializable) cpns); 270 intent.putExtra("couponset", (Serializable) cpns);
...@@ -272,6 +275,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -272,6 +275,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
272 } 275 }
273 } 276 }
274 } else { 277 } else {
278 + WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID()));
275 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004); 279 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004);
276 } 280 }
277 } 281 }
...@@ -296,6 +300,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -296,6 +300,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
296 analyticsEvent.setParameter("type", "coupon"); 300 analyticsEvent.setParameter("type", "coupon");
297 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 301 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
298 302
303 + WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID()));
299 WarplyManager.getSingleCampaign(dataItem.getCampaign().getSessionUUID()); 304 WarplyManager.getSingleCampaign(dataItem.getCampaign().getSessionUUID());
300 Intent intent = new Intent(GiftsForYouActivity.this, CouponsetInfoActivity.class); 305 Intent intent = new Intent(GiftsForYouActivity.this, CouponsetInfoActivity.class);
301 intent.putExtra("couponset", (Serializable) cpns); 306 intent.putExtra("couponset", (Serializable) cpns);
...@@ -305,6 +310,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -305,6 +310,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
305 } 310 }
306 } 311 }
307 } else { 312 } else {
313 + WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID()));
308 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004); 314 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004);
309 } 315 }
310 } 316 }
...@@ -327,6 +333,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -327,6 +333,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
327 analyticsEvent.setParameter("type", "gift"); 333 analyticsEvent.setParameter("type", "gift");
328 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 334 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
329 335
336 + WarplyAnalyticsManager.logTrackersEvent("click", ("Telco").concat(":").concat(ccms.getSessionId()));
330 WarplyManager.getSingleCampaign(dataItem.getCampaign().getSessionUUID()); 337 WarplyManager.getSingleCampaign(dataItem.getCampaign().getSessionUUID());
331 Intent intent = new Intent(GiftsForYouActivity.this, TelcoActivity.class); 338 Intent intent = new Intent(GiftsForYouActivity.this, TelcoActivity.class);
332 intent.putExtra("ccms", ccms); 339 intent.putExtra("ccms", ccms);
...@@ -340,15 +347,18 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -340,15 +347,18 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
340 if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) { 347 if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) {
341 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { 348 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
342 if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) { 349 if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) {
350 + WarplyAnalyticsManager.logTrackersEvent("click", ("Contextual").concat(":").concat(ccms.getSessionId()));
343 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCcmsUrl(dataItem.getCampaign(), ccms)), 1004); 351 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCcmsUrl(dataItem.getCampaign(), ccms)), 1004);
344 break; 352 break;
345 } 353 }
346 } 354 }
347 } else { 355 } else {
356 + WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID()));
348 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004); 357 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004);
349 } 358 }
350 } 359 }
351 } catch (Exception exception) { 360 } catch (Exception exception) {
361 + WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID()));
352 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004); 362 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004);
353 } 363 }
354 } else if (dataItem.getDataType() == 2) { 364 } else if (dataItem.getDataType() == 2) {
...@@ -371,6 +381,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -371,6 +381,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
371 analyticsEvent.setParameter("type", "gift"); 381 analyticsEvent.setParameter("type", "gift");
372 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 382 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
373 383
384 + WarplyAnalyticsManager.logTrackersEvent("click", ("Contextual").concat(":").concat(dataItem.getCCMS().getSessionId()));
374 Intent intent = new Intent(GiftsForYouActivity.this, ContextualActivity.class); 385 Intent intent = new Intent(GiftsForYouActivity.this, ContextualActivity.class);
375 intent.putExtra("ccms", dataItem.getCCMS()); 386 intent.putExtra("ccms", dataItem.getCCMS());
376 startActivity(intent); 387 startActivity(intent);
......
...@@ -35,6 +35,7 @@ import ly.warp.sdk.io.models.SharingList; ...@@ -35,6 +35,7 @@ import ly.warp.sdk.io.models.SharingList;
35 import ly.warp.sdk.io.request.WarplySharingHistoryRequest; 35 import ly.warp.sdk.io.request.WarplySharingHistoryRequest;
36 import ly.warp.sdk.utils.WarpUtils; 36 import ly.warp.sdk.utils.WarpUtils;
37 import ly.warp.sdk.utils.WarplyManagerHelper; 37 import ly.warp.sdk.utils.WarplyManagerHelper;
38 +import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
38 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 39 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
39 import ly.warp.sdk.utils.managers.WarplyManager; 40 import ly.warp.sdk.utils.managers.WarplyManager;
40 import ly.warp.sdk.views.adapters.ExpiredCouponAdapter; 41 import ly.warp.sdk.views.adapters.ExpiredCouponAdapter;
...@@ -91,6 +92,7 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -91,6 +92,7 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
91 @Override 92 @Override
92 public void onResume() { 93 public void onResume() {
93 super.onResume(); 94 super.onResume();
95 + WarplyAnalyticsManager.logTrackersEvent("screen", "LoyaltyHistoryScreen");
94 mTimer = 0; 96 mTimer = 0;
95 mSecondsHandler.post(new Runnable() { 97 mSecondsHandler.post(new Runnable() {
96 @Override 98 @Override
...@@ -137,6 +139,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -137,6 +139,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
137 return; 139 return;
138 } 140 }
139 if (view.getId() == R.id.ll_tab_expired) { 141 if (view.getId() == R.id.ll_tab_expired) {
142 + WarplyAnalyticsManager.logTrackersEvent("click", ("LoyaltyHistoryScreen")
143 + .concat(":")
144 + .concat("TabExpired"));
145 +
140 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_gradient2); 146 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_gradient2);
141 TextView expiredTab = findViewById(R.id.tv_expired_tab); 147 TextView expiredTab = findViewById(R.id.tv_expired_tab);
142 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4)); 148 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4));
...@@ -160,6 +166,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -160,6 +166,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
160 return; 166 return;
161 } 167 }
162 if (view.getId() == R.id.ll_tab_shared) { 168 if (view.getId() == R.id.ll_tab_shared) {
169 + WarplyAnalyticsManager.logTrackersEvent("click", ("LoyaltyHistoryScreen")
170 + .concat(":")
171 + .concat("TabShared"));
172 +
163 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_gradient2); 173 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_gradient2);
164 TextView sharedTab = findViewById(R.id.tv_shared_tab); 174 TextView sharedTab = findViewById(R.id.tv_shared_tab);
165 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4)); 175 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4));
......
...@@ -49,6 +49,7 @@ import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel; ...@@ -49,6 +49,7 @@ import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
49 import ly.warp.sdk.io.models.WarplyDealsAnalysisEventModel; 49 import ly.warp.sdk.io.models.WarplyDealsAnalysisEventModel;
50 import ly.warp.sdk.utils.WarpUtils; 50 import ly.warp.sdk.utils.WarpUtils;
51 import ly.warp.sdk.utils.WarplyManagerHelper; 51 import ly.warp.sdk.utils.WarplyManagerHelper;
52 +import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
52 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 53 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
53 import ly.warp.sdk.views.adapters.ActiveCouponAdapter; 54 import ly.warp.sdk.views.adapters.ActiveCouponAdapter;
54 55
...@@ -194,6 +195,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -194,6 +195,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
194 @Override 195 @Override
195 public void onResume() { 196 public void onResume() {
196 super.onResume(); 197 super.onResume();
198 + WarplyAnalyticsManager.logTrackersEvent("screen", "LoyaltyWalletScreen");
197 mTimer = 0; 199 mTimer = 0;
198 mSecondsHandler.post(new Runnable() { 200 mSecondsHandler.post(new Runnable() {
199 @Override 201 @Override
...@@ -225,10 +227,18 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -225,10 +227,18 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
225 return; 227 return;
226 } 228 }
227 if (view.getId() == R.id.ll_user_questionnaire || view.getId() == R.id.ll_user_badge) { 229 if (view.getId() == R.id.ll_user_questionnaire || view.getId() == R.id.ll_user_badge) {
230 + WarplyAnalyticsManager.logTrackersEvent("click", ("LoyaltyWalletScreen")
231 + .concat(":")
232 + .concat("Questionnaire"));
233 +
228 startActivityForResult(WarpViewActivity.createIntentFromURL(LoyaltyWallet.this, WarplyManagerHelper.openQuestionnaire()), 1000); 234 startActivityForResult(WarpViewActivity.createIntentFromURL(LoyaltyWallet.this, WarplyManagerHelper.openQuestionnaire()), 1000);
229 return; 235 return;
230 } 236 }
231 if (view.getId() == R.id.cl_deals_cos) { 237 if (view.getId() == R.id.cl_deals_cos) {
238 + WarplyAnalyticsManager.logTrackersEvent("click", ("LoyaltyWalletScreen")
239 + .concat(":")
240 + .concat("DealsBanner"));
241 +
232 WarpUtils.log("DFY coupon banner pressed!"); 242 WarpUtils.log("DFY coupon banner pressed!");
233 WarplyDealsAnalysisEventModel warplyDealsAnalysisEventModel = new WarplyDealsAnalysisEventModel(); 243 WarplyDealsAnalysisEventModel warplyDealsAnalysisEventModel = new WarplyDealsAnalysisEventModel();
234 warplyDealsAnalysisEventModel.setPressed(true); 244 warplyDealsAnalysisEventModel.setPressed(true);
...@@ -241,6 +251,10 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -241,6 +251,10 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
241 return; 251 return;
242 } 252 }
243 if (view.getId() == R.id.cl_deals_win) { 253 if (view.getId() == R.id.cl_deals_win) {
254 + WarplyAnalyticsManager.logTrackersEvent("click", ("LoyaltyWalletScreen")
255 + .concat(":")
256 + .concat("LoyaltyBanner"));
257 +
244 LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel(); 258 LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
245 analyticsEvent.setEventName("did_tap_gifts_for_you_badge"); 259 analyticsEvent.setEventName("did_tap_gifts_for_you_badge");
246 analyticsEvent.setParameter("screen", "Loyalty Wallet"); 260 analyticsEvent.setParameter("screen", "Loyalty Wallet");
...@@ -251,6 +265,10 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -251,6 +265,10 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
251 return; 265 return;
252 } 266 }
253 if (view.getId() == R.id.cl_mygifts) { 267 if (view.getId() == R.id.cl_mygifts) {
268 + WarplyAnalyticsManager.logTrackersEvent("click", ("LoyaltyWalletScreen")
269 + .concat(":")
270 + .concat("ActiveDealsBanner"));
271 +
254 ActiveDFYCouponEventModel activeCouponEventModel = new ActiveDFYCouponEventModel(); 272 ActiveDFYCouponEventModel activeCouponEventModel = new ActiveDFYCouponEventModel();
255 activeCouponEventModel.setPressed(true); 273 activeCouponEventModel.setPressed(true);
256 EventBus.getDefault().post(new WarplyEventBusManager(activeCouponEventModel)); 274 EventBus.getDefault().post(new WarplyEventBusManager(activeCouponEventModel));
...@@ -316,6 +334,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -316,6 +334,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
316 mRecyclerCoupons.setAdapter(mAdapterCoupons); 334 mRecyclerCoupons.setAdapter(mAdapterCoupons);
317 mAdapterCoupons.getPositionClicks() 335 mAdapterCoupons.getPositionClicks()
318 .doOnNext(coupon -> { 336 .doOnNext(coupon -> {
337 + WarplyAnalyticsManager.logTrackersEvent("click", ("Coupon").concat(":").concat(coupon.getName()));
319 Intent intent = new Intent(LoyaltyWallet.this, CouponInfoActivity.class); 338 Intent intent = new Intent(LoyaltyWallet.this, CouponInfoActivity.class);
320 intent.putExtra("coupon", (Serializable) coupon); 339 intent.putExtra("coupon", (Serializable) coupon);
321 intent.putExtra("isFromWallet", true); 340 intent.putExtra("isFromWallet", true);
...@@ -369,6 +388,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -369,6 +388,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
369 mRecyclerCoupons.setAdapter(mAdapterCoupons); 388 mRecyclerCoupons.setAdapter(mAdapterCoupons);
370 mAdapterCoupons.getPositionClicks() 389 mAdapterCoupons.getPositionClicks()
371 .doOnNext(coupon -> { 390 .doOnNext(coupon -> {
391 + WarplyAnalyticsManager.logTrackersEvent("click", ("Coupon").concat(":").concat(coupon.getName()));
372 Intent intent = new Intent(LoyaltyWallet.this, CouponInfoActivity.class); 392 Intent intent = new Intent(LoyaltyWallet.this, CouponInfoActivity.class);
373 intent.putExtra("coupon", (Serializable) coupon); 393 intent.putExtra("coupon", (Serializable) coupon);
374 intent.putExtra("isFromWallet", true); 394 intent.putExtra("isFromWallet", true);
......
...@@ -38,6 +38,7 @@ import ly.warp.sdk.services.EventCampaignService; ...@@ -38,6 +38,7 @@ import ly.warp.sdk.services.EventCampaignService;
38 import ly.warp.sdk.utils.WarpJSONParser; 38 import ly.warp.sdk.utils.WarpJSONParser;
39 import ly.warp.sdk.utils.WarpUtils; 39 import ly.warp.sdk.utils.WarpUtils;
40 import ly.warp.sdk.utils.WarplyManagerHelper; 40 import ly.warp.sdk.utils.WarplyManagerHelper;
41 +import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
41 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 42 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
42 import ly.warp.sdk.utils.managers.WarplyManager; 43 import ly.warp.sdk.utils.managers.WarplyManager;
43 import ly.warp.sdk.views.adapters.MergedMoreAdapter; 44 import ly.warp.sdk.views.adapters.MergedMoreAdapter;
...@@ -142,6 +143,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -142,6 +143,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
142 @Override 143 @Override
143 public void onResume() { 144 public void onResume() {
144 super.onResume(); 145 super.onResume();
146 + WarplyAnalyticsManager.logTrackersEvent("screen", "MoreForYouScreen");
145 mTimer = 0; 147 mTimer = 0;
146 mSecondsHandler.post(new Runnable() { 148 mSecondsHandler.post(new Runnable() {
147 @Override 149 @Override
...@@ -430,6 +432,8 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -430,6 +432,8 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
430 if (extraFields.has("type") && extraFields.optString("type").equals("telco")) { 432 if (extraFields.has("type") && extraFields.optString("type").equals("telco")) {
431 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { 433 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
432 if (ccms.getLoyaltyCampaignId().equals(moreItem.getSessionUUID())) { 434 if (ccms.getLoyaltyCampaignId().equals(moreItem.getSessionUUID())) {
435 + WarplyAnalyticsManager.logTrackersEvent("click", ("Telco").concat(":").concat(ccms.getSessionId()));
436 +
433 LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel(); 437 LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
434 analyticsEvent.setEventName("loyalty_sdk_offer_selected"); 438 analyticsEvent.setEventName("loyalty_sdk_offer_selected");
435 analyticsEvent.setParameter("name", ccms.getTitle()); 439 analyticsEvent.setParameter("name", ccms.getTitle());
...@@ -450,15 +454,18 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -450,15 +454,18 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
450 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { 454 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
451 if (ccms.getLoyaltyCampaignId().equals(moreItem.getSessionUUID())) { 455 if (ccms.getLoyaltyCampaignId().equals(moreItem.getSessionUUID())) {
452 WarpUtils.log("CCMS_CLICK " + ccms.toString()); 456 WarpUtils.log("CCMS_CLICK " + ccms.toString());
457 + WarplyAnalyticsManager.logTrackersEvent("click", ("Contextual").concat(":").concat(ccms.getSessionId()));
453 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCcmsUrl(moreItem, ccms)), 1003); 458 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCcmsUrl(moreItem, ccms)), 1003);
454 break; 459 break;
455 } 460 }
456 } 461 }
457 } else { 462 } else {
463 + WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(moreItem.getSessionUUID()));
458 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(moreItem)), 1003); 464 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(moreItem)), 1003);
459 } 465 }
460 } 466 }
461 } catch (Exception exception) { 467 } catch (Exception exception) {
468 + WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(moreItem.getSessionUUID()));
462 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(moreItem)), 1003); 469 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(moreItem)), 1003);
463 } 470 }
464 } 471 }
...@@ -470,6 +477,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -470,6 +477,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
470 analyticsEvent.setParameter("type", "gift"); 477 analyticsEvent.setParameter("type", "gift");
471 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 478 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
472 479
480 + WarplyAnalyticsManager.logTrackersEvent("click", ("Contextual").concat(":").concat(ccmsItem.getSessionId()));
473 Intent intent = new Intent(MoreForYouActivity.this, ContextualActivity.class); 481 Intent intent = new Intent(MoreForYouActivity.this, ContextualActivity.class);
474 intent.putExtra("ccms", ccmsItem); 482 intent.putExtra("ccms", ccmsItem);
475 startActivity(intent); 483 startActivity(intent);
......
...@@ -44,6 +44,7 @@ import ly.warp.sdk.io.models.Merchant; ...@@ -44,6 +44,7 @@ import ly.warp.sdk.io.models.Merchant;
44 import ly.warp.sdk.io.models.MerchantList; 44 import ly.warp.sdk.io.models.MerchantList;
45 import ly.warp.sdk.io.request.WarplyMerchantsRequest; 45 import ly.warp.sdk.io.request.WarplyMerchantsRequest;
46 import ly.warp.sdk.utils.constants.WarpConstants; 46 import ly.warp.sdk.utils.constants.WarpConstants;
47 +import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
47 import ly.warp.sdk.utils.managers.WarplyManager; 48 import ly.warp.sdk.utils.managers.WarplyManager;
48 49
49 50
...@@ -88,6 +89,7 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe ...@@ -88,6 +89,7 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
88 @Override 89 @Override
89 public void onResume() { 90 public void onResume() {
90 super.onResume(); 91 super.onResume();
92 + WarplyAnalyticsManager.logTrackersEvent("screen", "ShopsScreen");
91 } 93 }
92 94
93 @Override 95 @Override
...@@ -197,6 +199,7 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe ...@@ -197,6 +199,7 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
197 public boolean onMarkerClick(@NonNull Marker marker) { 199 public boolean onMarkerClick(@NonNull Marker marker) {
198 for (Merchant merch : mMerchantList) { 200 for (Merchant merch : mMerchantList) {
199 if (merch.getUuid().equals(marker.getSnippet())) { 201 if (merch.getUuid().equals(marker.getSnippet())) {
202 + WarplyAnalyticsManager.logTrackersEvent("click", ("ShopsScreenMarker").concat(":").concat(marker.getSnippet()));
200 final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this); 203 final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this);
201 bottomSheetDialog.setContentView(R.layout.dl_map_pin); 204 bottomSheetDialog.setContentView(R.layout.dl_map_pin);
202 205
......
...@@ -33,6 +33,7 @@ import ly.warp.sdk.io.models.LoyaltyContextualOfferModel; ...@@ -33,6 +33,7 @@ import ly.warp.sdk.io.models.LoyaltyContextualOfferModel;
33 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel; 33 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
34 import ly.warp.sdk.io.request.CosmoteSubmitOrderRequest; 34 import ly.warp.sdk.io.request.CosmoteSubmitOrderRequest;
35 import ly.warp.sdk.io.request.WarplyConsumerRequest; 35 import ly.warp.sdk.io.request.WarplyConsumerRequest;
36 +import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
36 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 37 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
37 import ly.warp.sdk.utils.managers.WarplyManager; 38 import ly.warp.sdk.utils.managers.WarplyManager;
38 39
...@@ -90,6 +91,7 @@ public class TelcoActivity extends Activity implements View.OnClickListener { ...@@ -90,6 +91,7 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
90 @Override 91 @Override
91 public void onResume() { 92 public void onResume() {
92 super.onResume(); 93 super.onResume();
94 + WarplyAnalyticsManager.logTrackersEvent("screen", "TelcoScreen");
93 95
94 // new Thread(() -> { 96 // new Thread(() -> {
95 // if (!Thread.currentThread().isInterrupted()) { 97 // if (!Thread.currentThread().isInterrupted()) {
...@@ -222,6 +224,7 @@ public class TelcoActivity extends Activity implements View.OnClickListener { ...@@ -222,6 +224,7 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
222 } 224 }
223 225
224 private void activateGift() { 226 private void activateGift() {
227 + WarplyAnalyticsManager.logTrackersEvent("click", ("ActivateTelco").concat(":").concat(mCCMS.getSessionId()));
225 new Thread(() -> { 228 new Thread(() -> {
226 if (!Thread.currentThread().isInterrupted()) { 229 if (!Thread.currentThread().isInterrupted()) {
227 WarplyManager.submitOrder(new CosmoteSubmitOrderRequest() 230 WarplyManager.submitOrder(new CosmoteSubmitOrderRequest()
......
...@@ -149,6 +149,11 @@ public class VolleyTransformer implements Listener<JSONObject>, ErrorListener { ...@@ -149,6 +149,11 @@ public class VolleyTransformer implements Listener<JSONObject>, ErrorListener {
149 if (response.has("result")) { 149 if (response.has("result")) {
150 JSONObject obj = response.optJSONObject("result"); 150 JSONObject obj = response.optJSONObject("result");
151 if (obj != null) { 151 if (obj != null) {
152 + if ((response.has("status") && response.optInt("status") == 7) && (obj.has("status") && obj.optString("status").equals("rejected"))) {
153 + mListener.onSuccess(response);
154 + return;
155 + }
156 +
152 if (obj.has("status") && obj.optString("status").equals("accepted")) { 157 if (obj.has("status") && obj.optString("status").equals("accepted")) {
153 mListener.onSuccess(response); 158 mListener.onSuccess(response);
154 return; 159 return;
......
...@@ -152,8 +152,10 @@ public class HttpClientStack implements HttpStack { ...@@ -152,8 +152,10 @@ public class HttpClientStack implements HttpStack {
152 headers.add(new BasicHeader(WarpConstants.HEADER_AUTHORIZATION, 152 headers.add(new BasicHeader(WarpConstants.HEADER_AUTHORIZATION,
153 "Bearer " + WarplyDBHelper.getInstance(Warply.getWarplyContext()).getAuthValue("access_token"))); 153 "Bearer " + WarplyDBHelper.getInstance(Warply.getWarplyContext()).getAuthValue("access_token")));
154 } else if (request.getTag() != null && request.getTag().equals("cosuser")) { 154 } else if (request.getTag() != null && request.getTag().equals("cosuser")) {
155 + // prod MVBQNFhCQzhFYTJBaUdCNkJWZGFGUERlTTNLQ3kzMjU6YzViMzAyZDY5N2FiNGY3NzhiNThhMTg0YzBkZWRmNGU=
156 + // dev MWlTM0EyNjcxT2Q0a1B5QkIydEs1ZU5uRENhR0NWQjQ6MjI4MjA4ZTliMTQzNGQ2MmIxNGI3ZDAzYjM2ZjUwMzg=
155 headers.add(new BasicHeader(WarpConstants.HEADER_AUTHORIZATION, 157 headers.add(new BasicHeader(WarpConstants.HEADER_AUTHORIZATION,
156 - "Basic MWlTM0EyNjcxT2Q0a1B5QkIydEs1ZU5uRENhR0NWQjQ6MjI4MjA4ZTliMTQzNGQ2MmIxNGI3ZDAzYjM2ZjUwMzg=")); 158 + "Basic MVBQNFhCQzhFYTJBaUdCNkJWZGFGUERlTTNLQ3kzMjU6YzViMzAyZDY5N2FiNGY3NzhiNThhMTg0YzBkZWRmNGU="));
157 } 159 }
158 httpPost.setHeaders(headers.toArray(new Header[headers.size()])); 160 httpPost.setHeaders(headers.toArray(new Header[headers.size()]));
159 byte[] body = request.getBody(); 161 byte[] body = request.getBody();
......
...@@ -101,8 +101,10 @@ public class HurlStack implements HttpStack { ...@@ -101,8 +101,10 @@ public class HurlStack implements HttpStack {
101 map.put(WarpConstants.HEADER_AUTHORIZATION, 101 map.put(WarpConstants.HEADER_AUTHORIZATION,
102 "Bearer " + WarplyDBHelper.getInstance(Warply.getWarplyContext()).getAuthValue("access_token")); 102 "Bearer " + WarplyDBHelper.getInstance(Warply.getWarplyContext()).getAuthValue("access_token"));
103 } else if (request.getTag() != null && request.getTag().equals("cosuser")) { 103 } else if (request.getTag() != null && request.getTag().equals("cosuser")) {
104 + // prod MVBQNFhCQzhFYTJBaUdCNkJWZGFGUERlTTNLQ3kzMjU6YzViMzAyZDY5N2FiNGY3NzhiNThhMTg0YzBkZWRmNGU=
105 + // dev MWlTM0EyNjcxT2Q0a1B5QkIydEs1ZU5uRENhR0NWQjQ6MjI4MjA4ZTliMTQzNGQ2MmIxNGI3ZDAzYjM2ZjUwMzg=
104 map.put(WarpConstants.HEADER_AUTHORIZATION, 106 map.put(WarpConstants.HEADER_AUTHORIZATION,
105 - "Basic MWlTM0EyNjcxT2Q0a1B5QkIydEs1ZU5uRENhR0NWQjQ6MjI4MjA4ZTliMTQzNGQ2MmIxNGI3ZDAzYjM2ZjUwMzg="); 107 + "Basic MVBQNFhCQzhFYTJBaUdCNkJWZGFGUERlTTNLQ3kzMjU6YzViMzAyZDY5N2FiNGY3NzhiNThhMTg0YzBkZWRmNGU=");
106 } 108 }
107 if (mUrlRewriter != null) { 109 if (mUrlRewriter != null) {
108 String rewritten = mUrlRewriter.rewriteUrl(url); 110 String rewritten = mUrlRewriter.rewriteUrl(url);
......
...@@ -106,9 +106,9 @@ public class WarplyHealthService extends Service implements SensorEventListener ...@@ -106,9 +106,9 @@ public class WarplyHealthService extends Service implements SensorEventListener
106 // b.setContentText(getString(R.string.cos_steps_for_good_notification_subtitle)); 106 // b.setContentText(getString(R.string.cos_steps_for_good_notification_subtitle));
107 b.setStyle(new NotificationCompat.BigTextStyle().bigText(getString(R.string.cos_steps_for_good_notification_subtitle))); 107 b.setStyle(new NotificationCompat.BigTextStyle().bigText(getString(R.string.cos_steps_for_good_notification_subtitle)));
108 b.setContentIntent(pbIntent); 108 b.setContentIntent(pbIntent);
109 - b.setAutoCancel(false); 109 + b.setAutoCancel(true);
110 b.setOngoing(true); 110 b.setOngoing(true);
111 - b.setCategory(Notification.CATEGORY_SERVICE); 111 +// b.setCategory(Notification.CATEGORY_SERVICE);
112 b.setSmallIcon(R.drawable.ic_launcher); 112 b.setSmallIcon(R.drawable.ic_launcher);
113 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && notificationManager != null) { 113 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && notificationManager != null) {
114 NotificationChannel notificationChannel = new NotificationChannel(STEPS_CHANNEL_ID, "steps_notification_channel", NotificationManager.IMPORTANCE_DEFAULT); 114 NotificationChannel notificationChannel = new NotificationChannel(STEPS_CHANNEL_ID, "steps_notification_channel", NotificationManager.IMPORTANCE_DEFAULT);
......
...@@ -145,6 +145,8 @@ public class WarpUtils { ...@@ -145,6 +145,8 @@ public class WarpUtils {
145 + "user_non_telco"; 145 + "user_non_telco";
146 private static final String PREFERENCES_STEPS_METERS_COUNTER = PREFERENCES_PREFIX 146 private static final String PREFERENCES_STEPS_METERS_COUNTER = PREFERENCES_PREFIX
147 + "steps_meters_counter"; 147 + "steps_meters_counter";
148 + private static final String PREFERENCES_TRACKERS_ENABLED = PREFERENCES_PREFIX
149 + + "trackers_enabled";
148 150
149 private static SharedPreferences _prefs; 151 private static SharedPreferences _prefs;
150 152
...@@ -644,6 +646,17 @@ public class WarpUtils { ...@@ -644,6 +646,17 @@ public class WarpUtils {
644 return Double.longBitsToDouble(prefs.getLong(PREFERENCES_STEPS_METERS_COUNTER, 0)); 646 return Double.longBitsToDouble(prefs.getLong(PREFERENCES_STEPS_METERS_COUNTER, 0));
645 } 647 }
646 648
649 + public static void setTrackersEnabled(Context context, boolean isEnabled) {
650 + SharedPreferences.Editor editor = getPreferences(context).edit();
651 + editor.putBoolean(PREFERENCES_TRACKERS_ENABLED, isEnabled);
652 + editor.apply();
653 + }
654 +
655 + public static boolean getTrackersEnabled(Context context) {
656 + SharedPreferences prefs = getPreferences(context);
657 + return prefs.getBoolean(PREFERENCES_TRACKERS_ENABLED, false);
658 + }
659 +
647 public static JSONObject getDeviceInfoObject(Context context) { 660 public static JSONObject getDeviceInfoObject(Context context) {
648 SharedPreferences prefs = getPreferences(context); 661 SharedPreferences prefs = getPreferences(context);
649 try { 662 try {
......
...@@ -84,6 +84,7 @@ import ly.warp.sdk.io.request.WarplyUserCouponsRequest; ...@@ -84,6 +84,7 @@ import ly.warp.sdk.io.request.WarplyUserCouponsRequest;
84 import ly.warp.sdk.services.EventService; 84 import ly.warp.sdk.services.EventService;
85 import ly.warp.sdk.services.FCMBaseMessagingService; 85 import ly.warp.sdk.services.FCMBaseMessagingService;
86 import ly.warp.sdk.services.WarplyHealthService; 86 import ly.warp.sdk.services.WarplyHealthService;
87 +import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
87 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 88 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
88 import ly.warp.sdk.utils.managers.WarplyManager; 89 import ly.warp.sdk.utils.managers.WarplyManager;
89 90
...@@ -653,6 +654,7 @@ public class WarplyManagerHelper { ...@@ -653,6 +654,7 @@ public class WarplyManagerHelper {
653 analyticsEvent.setParameter("type", "gift"); 654 analyticsEvent.setParameter("type", "gift");
654 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 655 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
655 656
657 + WarplyAnalyticsManager.logTrackersEvent("click", ("Contextual").concat(":").concat(item.getSessionId()));
656 Intent intent = new Intent(context, ContextualActivity.class); 658 Intent intent = new Intent(context, ContextualActivity.class);
657 intent.putExtra("ccms", item); 659 intent.putExtra("ccms", item);
658 context.startActivity(intent); 660 context.startActivity(intent);
...@@ -744,7 +746,7 @@ public class WarplyManagerHelper { ...@@ -744,7 +746,7 @@ public class WarplyManagerHelper {
744 } 746 }
745 747
746 WarpUtils.setWebviewParams(Warply.getWarplyContext(), params); 748 WarpUtils.setWebviewParams(Warply.getWarplyContext(), params);
747 - 749 + WarplyAnalyticsManager.logTrackersEvent("click", ("Contextual").concat(":").concat(item.getSessionId()));
748 context.startActivity(WarpViewActivity.createIntentFromURL(context, url)); 750 context.startActivity(WarpViewActivity.createIntentFromURL(context, url));
749 break; 751 break;
750 } 752 }
...@@ -756,6 +758,7 @@ public class WarplyManagerHelper { ...@@ -756,6 +758,7 @@ public class WarplyManagerHelper {
756 analyticsEvent.setParameter("type", "gift"); 758 analyticsEvent.setParameter("type", "gift");
757 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 759 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
758 760
761 + WarplyAnalyticsManager.logTrackersEvent("click", ("Telco").concat(":").concat(item.getSessionId()));
759 WarplyManager.getSingleCampaign(camp.getSessionUUID()); 762 WarplyManager.getSingleCampaign(camp.getSessionUUID());
760 Intent intent = new Intent(context, TelcoActivity.class); 763 Intent intent = new Intent(context, TelcoActivity.class);
761 intent.putExtra("ccms", item); 764 intent.putExtra("ccms", item);
...@@ -799,6 +802,7 @@ public class WarplyManagerHelper { ...@@ -799,6 +802,7 @@ public class WarplyManagerHelper {
799 analyticsEvent.setParameter("type", "coupon"); 802 analyticsEvent.setParameter("type", "coupon");
800 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 803 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
801 804
805 + WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(item.getSessionUUID()));
802 WarplyManager.getSingleCampaign(item.getSessionUUID()); 806 WarplyManager.getSingleCampaign(item.getSessionUUID());
803 Intent intent = new Intent(context, CouponsetInfoActivity.class); 807 Intent intent = new Intent(context, CouponsetInfoActivity.class);
804 intent.putExtra("couponset", (Serializable) cpns); 808 intent.putExtra("couponset", (Serializable) cpns);
...@@ -809,6 +813,7 @@ public class WarplyManagerHelper { ...@@ -809,6 +813,7 @@ public class WarplyManagerHelper {
809 } 813 }
810 } 814 }
811 } else { 815 } else {
816 + WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(item.getSessionUUID()));
812 context.startActivity(WarpViewActivity.createIntentFromURL(context, WarplyManagerHelper.constructCampaignUrl(item))); 817 context.startActivity(WarpViewActivity.createIntentFromURL(context, WarplyManagerHelper.constructCampaignUrl(item)));
813 } 818 }
814 } 819 }
...@@ -833,6 +838,7 @@ public class WarplyManagerHelper { ...@@ -833,6 +838,7 @@ public class WarplyManagerHelper {
833 analyticsEvent.setParameter("type", "coupon"); 838 analyticsEvent.setParameter("type", "coupon");
834 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 839 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
835 840
841 + WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(item.getSessionUUID()));
836 WarplyManager.getSingleCampaign(item.getSessionUUID()); 842 WarplyManager.getSingleCampaign(item.getSessionUUID());
837 Intent intent = new Intent(context, CouponsetInfoActivity.class); 843 Intent intent = new Intent(context, CouponsetInfoActivity.class);
838 intent.putExtra("couponset", (Serializable) cpns); 844 intent.putExtra("couponset", (Serializable) cpns);
...@@ -842,6 +848,7 @@ public class WarplyManagerHelper { ...@@ -842,6 +848,7 @@ public class WarplyManagerHelper {
842 } 848 }
843 } 849 }
844 } else { 850 } else {
851 + WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(item.getSessionUUID()));
845 context.startActivity(WarpViewActivity.createIntentFromURL(context, WarplyManagerHelper.constructCampaignUrl(item))); 852 context.startActivity(WarpViewActivity.createIntentFromURL(context, WarplyManagerHelper.constructCampaignUrl(item)));
846 } 853 }
847 } 854 }
...@@ -852,6 +859,7 @@ public class WarplyManagerHelper { ...@@ -852,6 +859,7 @@ public class WarplyManagerHelper {
852 return; 859 return;
853 } 860 }
854 861
862 + WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(item.getSessionUUID()));
855 context.startActivity(WarpViewActivity.createIntentFromURL(context, WarplyManagerHelper.constructCampaignUrl(item))); 863 context.startActivity(WarpViewActivity.createIntentFromURL(context, WarplyManagerHelper.constructCampaignUrl(item)));
856 } 864 }
857 } 865 }
...@@ -985,7 +993,7 @@ public class WarplyManagerHelper { ...@@ -985,7 +993,7 @@ public class WarplyManagerHelper {
985 } 993 }
986 994
987 public static void setTrackersEnabled(boolean isEnabled) { 995 public static void setTrackersEnabled(boolean isEnabled) {
988 -// WarpUtils.setTrackersEnabled(); 996 + WarpUtils.setTrackersEnabled(Warply.getWarplyContext(), isEnabled);
989 997
990 // JSONObject obj = new JSONObject(); 998 // JSONObject obj = new JSONObject();
991 // try { 999 // try {
......
...@@ -57,6 +57,11 @@ public class WarplyAnalyticsManager { ...@@ -57,6 +57,11 @@ public class WarplyAnalyticsManager {
57 sendEvent(eventPage, eventId, metadata, false); 57 sendEvent(eventPage, eventId, metadata, false);
58 } 58 }
59 59
60 + public static void logTrackersEvent(String eventType, String eventName) {
61 + if (WarpUtils.getTrackersEnabled(Warply.getWarplyContext()))
62 + sendEvent(null, eventType.concat(":").concat(eventName), null, false);
63 + }
64 +
60 /** 65 /**
61 * Log screen events so after we can check if there are in app campaigns to show 66 * Log screen events so after we can check if there are in app campaigns to show
62 * (per screen or all screens). After we send the event with priority we make 67 * (per screen or all screens). After we send the event with priority we make
......
...@@ -2124,7 +2124,7 @@ public class WarplyManager { ...@@ -2124,7 +2124,7 @@ public class WarplyManager {
2124 @Override 2124 @Override
2125 public void onSuccess(JSONObject result) { 2125 public void onSuccess(JSONObject result) {
2126 int status = result.optInt("status", 2); 2126 int status = result.optInt("status", 2);
2127 - if (status == 1 || status == 4 || status == 5) 2127 + if (status == 1 || status == 4 || status == 5 || status == 7)
2128 receiver.onSuccess(result); 2128 receiver.onSuccess(result);
2129 else 2129 else
2130 receiver.onFailure(status); 2130 receiver.onFailure(status);
......
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
117 <string name="cos_shared_gifts_tab">Μοιρασμένα δώρα</string> 117 <string name="cos_shared_gifts_tab">Μοιρασμένα δώρα</string>
118 <string name="cos_shared_coupon_receiver">Εκπτωτικό κουπόνι προς</string> 118 <string name="cos_shared_coupon_receiver">Εκπτωτικό κουπόνι προς</string>
119 <string name="cos_shared_coupon_sender">Έκπτωτικό κουπόνι από</string> 119 <string name="cos_shared_coupon_sender">Έκπτωτικό κουπόνι από</string>
120 - <string name="cos_steps_for_good_notification_title">Steps for Good</string> 120 + <string name="cos_steps_for_good_notification_title">Steps For Good</string>
121 <string name="cos_empty_wallet">Δεν έχεις κάποιον ενεργό κωδικό ή κουπόνι! Μπες τώρα στην ενότητα COSMOTE For You και βρες αποκλειστικές προσφορές!</string> 121 <string name="cos_empty_wallet">Δεν έχεις κάποιον ενεργό κωδικό ή κουπόνι! Μπες τώρα στην ενότητα COSMOTE For You και βρες αποκλειστικές προσφορές!</string>
122 <string name="cos_wallet_text1">Μέχρι τώρα έχεις κερδίσει&#160;</string> 122 <string name="cos_wallet_text1">Μέχρι τώρα έχεις κερδίσει&#160;</string>
123 <string name="cos_wallet_text2">&#160;με το DEALS for YOU!</string> 123 <string name="cos_wallet_text2">&#160;με το DEALS for YOU!</string>
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
138 <string name="cos_dlg_pacing_goal">Πέτυχες το στόχο του μήνα! Διάλεξε το δώρο που επιθυμείς να ενεργοποιήσεις!</string> 138 <string name="cos_dlg_pacing_goal">Πέτυχες το στόχο του μήνα! Διάλεξε το δώρο που επιθυμείς να ενεργοποιήσεις!</string>
139 <string name="cos_mfy_other">ΆΛΛΕΣ</string> 139 <string name="cos_mfy_other">ΆΛΛΕΣ</string>
140 <string name="cos_coupon_share_telco">Επιλογή σύνδεσης</string> 140 <string name="cos_coupon_share_telco">Επιλογή σύνδεσης</string>
141 - <string name="cos_steps_for_good_notification_subtitle">Περπάτησε κάθε μέρα περισσότερο για να ολοκληρώσεις το στόχο του μήνα και να ξεκλειδώσεις μοναδικές προσφορές!</string> 141 + <string name="cos_steps_for_good_notification_subtitle">Η υπηρεσία είναι ενεργή για την καταχώρηση των βημάτων σας.</string>
142 <string name="cos_comma">,</string> 142 <string name="cos_comma">,</string>
143 <string name="cos_dlg_non_telco_title">Αδυναμία ενεργοποίησης</string> 143 <string name="cos_dlg_non_telco_title">Αδυναμία ενεργοποίησης</string>
144 <string name="cos_share_no_assets">Για την αποστολή του δώρου σου χρειάζεται να έχεις κινητό COSMOTE.</string> 144 <string name="cos_share_no_assets">Για την αποστολή του δώρου σου χρειάζεται να έχεις κινητό COSMOTE.</string>
......