open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
66869a02 1 parent 12f1cf86

new keys

Inline Side-by-side
Showing 15 changed files with 56 additions and 55 deletions
...@@ -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-cosbeta91' 5 + PUBLISH_VERSION = '4.5.4-cosbeta92'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
......
...@@ -61,7 +61,7 @@ public class ActiveCouponsActivity extends Activity implements View.OnClickListe ...@@ -61,7 +61,7 @@ public class ActiveCouponsActivity extends Activity implements View.OnClickListe
61 @Override 61 @Override
62 public void onResume() { 62 public void onResume() {
63 super.onResume(); 63 super.onResume();
64 - WarplyAnalyticsManager.logTrackersEvent("screen", "ActiveCouponsScreen"); 64 + WarplyAnalyticsManager.logTrackersEvent(this, "screen", "ActiveCouponsScreen");
65 filterItems(); 65 filterItems();
66 } 66 }
67 67
...@@ -110,7 +110,7 @@ public class ActiveCouponsActivity extends Activity implements View.OnClickListe ...@@ -110,7 +110,7 @@ public class ActiveCouponsActivity extends Activity implements View.OnClickListe
110 mRecyclerCoupons.setAdapter(mAdapterCoupons); 110 mRecyclerCoupons.setAdapter(mAdapterCoupons);
111 mAdapterCoupons.getPositionClicks() 111 mAdapterCoupons.getPositionClicks()
112 .doOnNext(coupon -> { 112 .doOnNext(coupon -> {
113 - WarplyAnalyticsManager.logTrackersEvent("click", ("Coupon").concat(":").concat(coupon.getName())); 113 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Coupon").concat(":").concat(coupon.getName()));
114 Intent intent = new Intent(ActiveCouponsActivity.this, CouponInfoActivity.class); 114 Intent intent = new Intent(ActiveCouponsActivity.this, CouponInfoActivity.class);
115 intent.putExtra("coupon", (Serializable) coupon); 115 intent.putExtra("coupon", (Serializable) coupon);
116 startActivity(intent); 116 startActivity(intent);
......
...@@ -61,7 +61,7 @@ public class ActiveGiftsActivity extends Activity implements View.OnClickListene ...@@ -61,7 +61,7 @@ public class ActiveGiftsActivity extends Activity implements View.OnClickListene
61 @Override 61 @Override
62 public void onResume() { 62 public void onResume() {
63 super.onResume(); 63 super.onResume();
64 - WarplyAnalyticsManager.logTrackersEvent("screen", "ActiveGiftsScreen"); 64 + WarplyAnalyticsManager.logTrackersEvent(this, "screen", "ActiveGiftsScreen");
65 } 65 }
66 66
67 @Override 67 @Override
......
...@@ -78,7 +78,7 @@ public class ContextualActivity extends Activity implements View.OnClickListener ...@@ -78,7 +78,7 @@ public class ContextualActivity extends Activity implements View.OnClickListener
78 @Override 78 @Override
79 public void onResume() { 79 public void onResume() {
80 super.onResume(); 80 super.onResume();
81 - WarplyAnalyticsManager.logTrackersEvent("screen", "ContextualScreen"); 81 + WarplyAnalyticsManager.logTrackersEvent(this, "screen", "ContextualScreen");
82 82
83 // new Thread(() -> { 83 // new Thread(() -> {
84 // if (!Thread.currentThread().isInterrupted()) { 84 // if (!Thread.currentThread().isInterrupted()) {
...@@ -187,10 +187,10 @@ public class ContextualActivity extends Activity implements View.OnClickListener ...@@ -187,10 +187,10 @@ public class ContextualActivity extends Activity implements View.OnClickListener
187 } 187 }
188 188
189 private void activateGift() { 189 private void activateGift() {
190 - WarplyAnalyticsManager.logTrackersEvent("click", ("ActivateContextual") 190 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("ActivateContextual")
191 .concat(":") 191 .concat(":")
192 .concat(mCCMS.getSessionId())); 192 .concat(mCCMS.getSessionId()));
193 - 193 +
194 new Thread(() -> { 194 new Thread(() -> {
195 if (!Thread.currentThread().isInterrupted()) { 195 if (!Thread.currentThread().isInterrupted()) {
196 WarplyManager.submitOrder(new CosmoteSubmitOrderRequest() 196 WarplyManager.submitOrder(new CosmoteSubmitOrderRequest()
......
...@@ -90,7 +90,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -90,7 +90,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
90 @Override 90 @Override
91 public void onResume() { 91 public void onResume() {
92 super.onResume(); 92 super.onResume();
93 - WarplyAnalyticsManager.logTrackersEvent("screen", "CouponScreen"); 93 + WarplyAnalyticsManager.logTrackersEvent(this, "screen", "CouponScreen");
94 } 94 }
95 95
96 @Override 96 @Override
...@@ -111,7 +111,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -111,7 +111,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
111 return; 111 return;
112 } 112 }
113 if (view.getId() == R.id.ll_gift_it) { 113 if (view.getId() == R.id.ll_gift_it) {
114 - WarplyAnalyticsManager.logTrackersEvent("click", ("ShareCoupon") 114 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("ShareCoupon")
115 .concat(":") 115 .concat(":")
116 .concat(mCoupon.getName())); 116 .concat(mCoupon.getName()));
117 117
...@@ -125,7 +125,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -125,7 +125,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
125 return; 125 return;
126 } 126 }
127 if (view.getId() == R.id.ll_shops) { 127 if (view.getId() == R.id.ll_shops) {
128 - WarplyAnalyticsManager.logTrackersEvent("click", "SeeShops"); 128 + WarplyAnalyticsManager.logTrackersEvent(this, "click", "SeeShops");
129 129
130 Intent intent = new Intent(CouponInfoActivity.this, ShopsActivity.class); 130 Intent intent = new Intent(CouponInfoActivity.this, ShopsActivity.class);
131 intent.putExtra("couponset", (Serializable) mCouponset); 131 intent.putExtra("couponset", (Serializable) mCouponset);
......
...@@ -93,7 +93,7 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -93,7 +93,7 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
93 @Override 93 @Override
94 public void onResume() { 94 public void onResume() {
95 super.onResume(); 95 super.onResume();
96 - WarplyAnalyticsManager.logTrackersEvent("screen", "CouponShareScreen"); 96 + WarplyAnalyticsManager.logTrackersEvent(this, "screen", "CouponShareScreen");
97 97
98 WarplyManager.getConsumer(new WarplyConsumerRequest() 98 WarplyManager.getConsumer(new WarplyConsumerRequest()
99 , mConsumerCallback); 99 , mConsumerCallback);
...@@ -275,7 +275,7 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -275,7 +275,7 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
275 .setTitle(R.string.cos_dlg_positive_coupon_title) 275 .setTitle(R.string.cos_dlg_positive_coupon_title)
276 .setMessage(R.string.cos_dlg_positive_coupon_subtitle) 276 .setMessage(R.string.cos_dlg_positive_coupon_subtitle)
277 .setPositiveButton(R.string.cos_dlg_negative_button3, (dialogPositive, whichPositive) -> { 277 .setPositiveButton(R.string.cos_dlg_negative_button3, (dialogPositive, whichPositive) -> {
278 - WarplyAnalyticsManager.logTrackersEvent("click", ("ShareCoupon") 278 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("ShareCoupon")
279 .concat(":") 279 .concat(":")
280 .concat(mCoupon.getName())); 280 .concat(mCoupon.getName()));
281 281
......
...@@ -98,7 +98,7 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe ...@@ -98,7 +98,7 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
98 @Override 98 @Override
99 public void onResume() { 99 public void onResume() {
100 super.onResume(); 100 super.onResume();
101 - WarplyAnalyticsManager.logTrackersEvent("screen", "CouponsetScreen"); 101 + WarplyAnalyticsManager.logTrackersEvent(this, "screen", "CouponsetScreen");
102 } 102 }
103 103
104 @Override 104 @Override
...@@ -109,7 +109,7 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe ...@@ -109,7 +109,7 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
109 } 109 }
110 if (view.getId() == R.id.ll_get_gift) { 110 if (view.getId() == R.id.ll_get_gift) {
111 mPbLoading.setVisibility(View.VISIBLE); 111 mPbLoading.setVisibility(View.VISIBLE);
112 - WarplyAnalyticsManager.logTrackersEvent("click", ("RetrieveCoupon") 112 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("RetrieveCoupon")
113 .concat(":") 113 .concat(":")
114 .concat(mCouponset.getUuid())); 114 .concat(mCouponset.getUuid()));
115 if (mCcms == null) { 115 if (mCcms == null) {
......
...@@ -95,7 +95,7 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli ...@@ -95,7 +95,7 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli
95 @Override 95 @Override
96 public void onResume() { 96 public void onResume() {
97 super.onResume(); 97 super.onResume();
98 - WarplyAnalyticsManager.logTrackersEvent("screen", "GiftsForYouScreen"); 98 + WarplyAnalyticsManager.logTrackersEvent(this, "screen", "GiftsForYouScreen");
99 mTimer = 0; 99 mTimer = 0;
100 mSecondsHandler.post(new Runnable() { 100 mSecondsHandler.post(new Runnable() {
101 @Override 101 @Override
...@@ -249,7 +249,7 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli ...@@ -249,7 +249,7 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli
249 analyticsEvent.setParameter("type", "coupon"); 249 analyticsEvent.setParameter("type", "coupon");
250 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 250 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
251 251
252 - WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID())); 252 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID()));
253 WarplyManager.getSingleCampaign(dataItem.getCampaign().getSessionUUID()); 253 WarplyManager.getSingleCampaign(dataItem.getCampaign().getSessionUUID());
254 Intent intent = new Intent(GiftsForYouActivity.this, CouponsetInfoActivity.class); 254 Intent intent = new Intent(GiftsForYouActivity.this, CouponsetInfoActivity.class);
255 intent.putExtra("couponset", (Serializable) cpns); 255 intent.putExtra("couponset", (Serializable) cpns);
...@@ -260,7 +260,7 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli ...@@ -260,7 +260,7 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli
260 } 260 }
261 } 261 }
262 } else { 262 } else {
263 - WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID())); 263 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID()));
264 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004); 264 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004);
265 } 265 }
266 } 266 }
...@@ -285,7 +285,7 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli ...@@ -285,7 +285,7 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli
285 analyticsEvent.setParameter("type", "coupon"); 285 analyticsEvent.setParameter("type", "coupon");
286 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 286 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
287 287
288 - WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID())); 288 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID()));
289 WarplyManager.getSingleCampaign(dataItem.getCampaign().getSessionUUID()); 289 WarplyManager.getSingleCampaign(dataItem.getCampaign().getSessionUUID());
290 Intent intent = new Intent(GiftsForYouActivity.this, CouponsetInfoActivity.class); 290 Intent intent = new Intent(GiftsForYouActivity.this, CouponsetInfoActivity.class);
291 intent.putExtra("couponset", (Serializable) cpns); 291 intent.putExtra("couponset", (Serializable) cpns);
...@@ -295,7 +295,7 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli ...@@ -295,7 +295,7 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli
295 } 295 }
296 } 296 }
297 } else { 297 } else {
298 - WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID())); 298 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID()));
299 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004); 299 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004);
300 } 300 }
301 } 301 }
...@@ -318,7 +318,7 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli ...@@ -318,7 +318,7 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli
318 analyticsEvent.setParameter("type", "gift"); 318 analyticsEvent.setParameter("type", "gift");
319 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 319 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
320 320
321 - WarplyAnalyticsManager.logTrackersEvent("click", ("Telco").concat(":").concat(ccms.getSessionId())); 321 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Telco").concat(":").concat(ccms.getSessionId()));
322 WarplyManager.getSingleCampaign(dataItem.getCampaign().getSessionUUID()); 322 WarplyManager.getSingleCampaign(dataItem.getCampaign().getSessionUUID());
323 Intent intent = new Intent(GiftsForYouActivity.this, TelcoActivity.class); 323 Intent intent = new Intent(GiftsForYouActivity.this, TelcoActivity.class);
324 intent.putExtra("ccms", ccms); 324 intent.putExtra("ccms", ccms);
...@@ -332,18 +332,18 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli ...@@ -332,18 +332,18 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli
332 if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) { 332 if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) {
333 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { 333 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
334 if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) { 334 if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) {
335 - WarplyAnalyticsManager.logTrackersEvent("click", ("Contextual").concat(":").concat(ccms.getSessionId())); 335 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Contextual").concat(":").concat(ccms.getSessionId()));
336 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCcmsUrl(dataItem.getCampaign(), ccms)), 1004); 336 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCcmsUrl(dataItem.getCampaign(), ccms)), 1004);
337 break; 337 break;
338 } 338 }
339 } 339 }
340 } else { 340 } else {
341 - WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID())); 341 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID()));
342 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004); 342 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004);
343 } 343 }
344 } 344 }
345 } catch (Exception exception) { 345 } catch (Exception exception) {
346 - WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID())); 346 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Loyalty").concat(":").concat(dataItem.getCampaign().getSessionUUID()));
347 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004); 347 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004);
348 } 348 }
349 } else if (dataItem.getDataType() == 2) { 349 } else if (dataItem.getDataType() == 2) {
...@@ -366,7 +366,7 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli ...@@ -366,7 +366,7 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli
366 analyticsEvent.setParameter("type", "gift"); 366 analyticsEvent.setParameter("type", "gift");
367 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 367 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
368 368
369 - WarplyAnalyticsManager.logTrackersEvent("click", ("Contextual").concat(":").concat(dataItem.getCCMS().getSessionId())); 369 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Contextual").concat(":").concat(dataItem.getCCMS().getSessionId()));
370 Intent intent = new Intent(GiftsForYouActivity.this, ContextualActivity.class); 370 Intent intent = new Intent(GiftsForYouActivity.this, ContextualActivity.class);
371 intent.putExtra("ccms", dataItem.getCCMS()); 371 intent.putExtra("ccms", dataItem.getCCMS());
372 startActivity(intent); 372 startActivity(intent);
......
...@@ -92,7 +92,7 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -92,7 +92,7 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
92 @Override 92 @Override
93 public void onResume() { 93 public void onResume() {
94 super.onResume(); 94 super.onResume();
95 - WarplyAnalyticsManager.logTrackersEvent("screen", "LoyaltyHistoryScreen"); 95 + WarplyAnalyticsManager.logTrackersEvent(this, "screen", "LoyaltyHistoryScreen");
96 mTimer = 0; 96 mTimer = 0;
97 mSecondsHandler.post(new Runnable() { 97 mSecondsHandler.post(new Runnable() {
98 @Override 98 @Override
...@@ -139,7 +139,7 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -139,7 +139,7 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
139 return; 139 return;
140 } 140 }
141 if (view.getId() == R.id.ll_tab_expired) { 141 if (view.getId() == R.id.ll_tab_expired) {
142 - WarplyAnalyticsManager.logTrackersEvent("click", ("LoyaltyHistoryScreen") 142 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyHistoryScreen")
143 .concat(":") 143 .concat(":")
144 .concat("TabExpired")); 144 .concat("TabExpired"));
145 145
...@@ -166,7 +166,7 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -166,7 +166,7 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
166 return; 166 return;
167 } 167 }
168 if (view.getId() == R.id.ll_tab_shared) { 168 if (view.getId() == R.id.ll_tab_shared) {
169 - WarplyAnalyticsManager.logTrackersEvent("click", ("LoyaltyHistoryScreen") 169 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyHistoryScreen")
170 .concat(":") 170 .concat(":")
171 .concat("TabShared")); 171 .concat("TabShared"));
172 172
......
...@@ -157,7 +157,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -157,7 +157,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
157 @Override 157 @Override
158 public void onResume() { 158 public void onResume() {
159 super.onResume(); 159 super.onResume();
160 - WarplyAnalyticsManager.logTrackersEvent("screen", "LoyaltyWalletScreen"); 160 + WarplyAnalyticsManager.logTrackersEvent(this, "screen", "LoyaltyWalletScreen");
161 mTimer = 0; 161 mTimer = 0;
162 mSecondsHandler.post(new Runnable() { 162 mSecondsHandler.post(new Runnable() {
163 @Override 163 @Override
...@@ -189,7 +189,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -189,7 +189,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
189 return; 189 return;
190 } 190 }
191 if (view.getId() == R.id.ll_user_questionnaire || view.getId() == R.id.ll_user_badge) { 191 if (view.getId() == R.id.ll_user_questionnaire || view.getId() == R.id.ll_user_badge) {
192 - WarplyAnalyticsManager.logTrackersEvent("click", ("LoyaltyWalletScreen") 192 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyWalletScreen")
193 .concat(":") 193 .concat(":")
194 .concat("Questionnaire")); 194 .concat("Questionnaire"));
195 195
...@@ -197,7 +197,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -197,7 +197,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
197 return; 197 return;
198 } 198 }
199 if (view.getId() == R.id.cl_deals_cos) { 199 if (view.getId() == R.id.cl_deals_cos) {
200 - WarplyAnalyticsManager.logTrackersEvent("click", ("LoyaltyWalletScreen") 200 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyWalletScreen")
201 .concat(":") 201 .concat(":")
202 .concat("DealsBanner")); 202 .concat("DealsBanner"));
203 203
...@@ -213,7 +213,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -213,7 +213,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
213 return; 213 return;
214 } 214 }
215 if (view.getId() == R.id.cl_deals_win) { 215 if (view.getId() == R.id.cl_deals_win) {
216 - WarplyAnalyticsManager.logTrackersEvent("click", ("LoyaltyWalletScreen") 216 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyWalletScreen")
217 .concat(":") 217 .concat(":")
218 .concat("LoyaltyBanner")); 218 .concat("LoyaltyBanner"));
219 219
...@@ -227,7 +227,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -227,7 +227,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
227 return; 227 return;
228 } 228 }
229 if (view.getId() == R.id.cl_mygifts) { 229 if (view.getId() == R.id.cl_mygifts) {
230 - WarplyAnalyticsManager.logTrackersEvent("click", ("LoyaltyWalletScreen") 230 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyWalletScreen")
231 .concat(":") 231 .concat(":")
232 .concat("ActiveDealsBanner")); 232 .concat("ActiveDealsBanner"));
233 233
...@@ -296,7 +296,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -296,7 +296,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
296 mRecyclerCoupons.setAdapter(mAdapterCoupons); 296 mRecyclerCoupons.setAdapter(mAdapterCoupons);
297 mAdapterCoupons.getPositionClicks() 297 mAdapterCoupons.getPositionClicks()
298 .doOnNext(coupon -> { 298 .doOnNext(coupon -> {
299 - WarplyAnalyticsManager.logTrackersEvent("click", ("Coupon").concat(":").concat(coupon.getName())); 299 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Coupon").concat(":").concat(coupon.getName()));
300 Intent intent = new Intent(LoyaltyWallet.this, CouponInfoActivity.class); 300 Intent intent = new Intent(LoyaltyWallet.this, CouponInfoActivity.class);
301 intent.putExtra("coupon", (Serializable) coupon); 301 intent.putExtra("coupon", (Serializable) coupon);
302 intent.putExtra("isFromWallet", true); 302 intent.putExtra("isFromWallet", true);
...@@ -350,7 +350,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -350,7 +350,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
350 mRecyclerCoupons.setAdapter(mAdapterCoupons); 350 mRecyclerCoupons.setAdapter(mAdapterCoupons);
351 mAdapterCoupons.getPositionClicks() 351 mAdapterCoupons.getPositionClicks()
352 .doOnNext(coupon -> { 352 .doOnNext(coupon -> {
353 - WarplyAnalyticsManager.logTrackersEvent("click", ("Coupon").concat(":").concat(coupon.getName())); 353 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Coupon").concat(":").concat(coupon.getName()));
354 Intent intent = new Intent(LoyaltyWallet.this, CouponInfoActivity.class); 354 Intent intent = new Intent(LoyaltyWallet.this, CouponInfoActivity.class);
355 intent.putExtra("coupon", (Serializable) coupon); 355 intent.putExtra("coupon", (Serializable) coupon);
356 intent.putExtra("isFromWallet", true); 356 intent.putExtra("isFromWallet", true);
......
...@@ -82,6 +82,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -82,6 +82,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
82 private MoreContextualAdapter mAdapterContextual; 82 private MoreContextualAdapter mAdapterContextual;
83 private int mTimer = 0; 83 private int mTimer = 0;
84 private Handler mSecondsHandler; 84 private Handler mSecondsHandler;
85 +
85 /** 86 /**
86 * New Implementation 87 * New Implementation
87 */ 88 */
...@@ -138,7 +139,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -138,7 +139,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
138 @Override 139 @Override
139 public void onResume() { 140 public void onResume() {
140 super.onResume(); 141 super.onResume();
141 - WarplyAnalyticsManager.logTrackersEvent("screen", "MoreForYouScreen"); 142 + WarplyAnalyticsManager.logTrackersEvent(this, "screen", "MoreForYouScreen");
142 mTimer = 0; 143 mTimer = 0;
143 mSecondsHandler.post(new Runnable() { 144 mSecondsHandler.post(new Runnable() {
144 @Override 145 @Override
...@@ -417,7 +418,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -417,7 +418,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
417 if (extraFields.has("type") && extraFields.optString("type").equals("telco")) { 418 if (extraFields.has("type") && extraFields.optString("type").equals("telco")) {
418 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { 419 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
419 if (ccms.getLoyaltyCampaignId().equals(moreItem.getSessionUUID())) { 420 if (ccms.getLoyaltyCampaignId().equals(moreItem.getSessionUUID())) {
420 - WarplyAnalyticsManager.logTrackersEvent("click", ("Telco").concat(":").concat(ccms.getSessionId())); 421 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Telco").concat(":").concat(ccms.getSessionId()));
421 422
422 LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel(); 423 LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
423 analyticsEvent.setEventName("loyalty_sdk_offer_selected"); 424 analyticsEvent.setEventName("loyalty_sdk_offer_selected");
...@@ -439,18 +440,18 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -439,18 +440,18 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
439 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { 440 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
440 if (ccms.getLoyaltyCampaignId().equals(moreItem.getSessionUUID())) { 441 if (ccms.getLoyaltyCampaignId().equals(moreItem.getSessionUUID())) {
441 WarpUtils.log("CCMS_CLICK " + ccms.toString()); 442 WarpUtils.log("CCMS_CLICK " + ccms.toString());
442 - WarplyAnalyticsManager.logTrackersEvent("click", ("Contextual").concat(":").concat(ccms.getSessionId())); 443 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Contextual").concat(":").concat(ccms.getSessionId()));
443 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCcmsUrl(moreItem, ccms)), 1003); 444 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCcmsUrl(moreItem, ccms)), 1003);
444 break; 445 break;
445 } 446 }
446 } 447 }
447 } else { 448 } else {
448 - WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(moreItem.getSessionUUID())); 449 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Loyalty").concat(":").concat(moreItem.getSessionUUID()));
449 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(moreItem)), 1003); 450 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(moreItem)), 1003);
450 } 451 }
451 } 452 }
452 } catch (Exception exception) { 453 } catch (Exception exception) {
453 - WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(moreItem.getSessionUUID())); 454 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Loyalty").concat(":").concat(moreItem.getSessionUUID()));
454 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(moreItem)), 1003); 455 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(moreItem)), 1003);
455 } 456 }
456 } 457 }
...@@ -462,7 +463,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -462,7 +463,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
462 analyticsEvent.setParameter("type", "gift"); 463 analyticsEvent.setParameter("type", "gift");
463 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 464 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
464 465
465 - WarplyAnalyticsManager.logTrackersEvent("click", ("Contextual").concat(":").concat(ccmsItem.getSessionId())); 466 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Contextual").concat(":").concat(ccmsItem.getSessionId()));
466 Intent intent = new Intent(MoreForYouActivity.this, ContextualActivity.class); 467 Intent intent = new Intent(MoreForYouActivity.this, ContextualActivity.class);
467 intent.putExtra("ccms", ccmsItem); 468 intent.putExtra("ccms", ccmsItem);
468 startActivity(intent); 469 startActivity(intent);
...@@ -476,7 +477,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -476,7 +477,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
476 ArrayList<Campaign> mfyList = new ArrayList<>(); 477 ArrayList<Campaign> mfyList = new ArrayList<>();
477 if (WarplyManagerHelper.getCampaignListAll() != null && WarplyManagerHelper.getCampaignListAll().size() > 0) { 478 if (WarplyManagerHelper.getCampaignListAll() != null && WarplyManagerHelper.getCampaignListAll().size() > 0) {
478 final ArrayList<Campaign> customs = new ArrayList<Campaign>(); 479 final ArrayList<Campaign> customs = new ArrayList<Campaign>();
479 - for(Campaign campaignItem: WarplyManagerHelper.getCampaignListAll()) { 480 + for (Campaign campaignItem : WarplyManagerHelper.getCampaignListAll()) {
480 if (!customs.contains(campaignItem)) { 481 if (!customs.contains(campaignItem)) {
481 customs.add(campaignItem); 482 customs.add(campaignItem);
482 } 483 }
......
...@@ -89,7 +89,7 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe ...@@ -89,7 +89,7 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
89 @Override 89 @Override
90 public void onResume() { 90 public void onResume() {
91 super.onResume(); 91 super.onResume();
92 - WarplyAnalyticsManager.logTrackersEvent("screen", "ShopsScreen"); 92 + WarplyAnalyticsManager.logTrackersEvent(this, "screen", "ShopsScreen");
93 } 93 }
94 94
95 @Override 95 @Override
...@@ -199,7 +199,7 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe ...@@ -199,7 +199,7 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
199 public boolean onMarkerClick(@NonNull Marker marker) { 199 public boolean onMarkerClick(@NonNull Marker marker) {
200 for (Merchant merch : mMerchantList) { 200 for (Merchant merch : mMerchantList) {
201 if (merch.getUuid().equals(marker.getSnippet())) { 201 if (merch.getUuid().equals(marker.getSnippet())) {
202 - WarplyAnalyticsManager.logTrackersEvent("click", ("ShopsScreenMarker").concat(":").concat(marker.getSnippet())); 202 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("ShopsScreenMarker").concat(":").concat(marker.getSnippet()));
203 final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this); 203 final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this);
204 bottomSheetDialog.setContentView(R.layout.dl_map_pin); 204 bottomSheetDialog.setContentView(R.layout.dl_map_pin);
205 205
......
...@@ -91,7 +91,7 @@ public class TelcoActivity extends Activity implements View.OnClickListener { ...@@ -91,7 +91,7 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
91 @Override 91 @Override
92 public void onResume() { 92 public void onResume() {
93 super.onResume(); 93 super.onResume();
94 - WarplyAnalyticsManager.logTrackersEvent("screen", "TelcoScreen"); 94 + WarplyAnalyticsManager.logTrackersEvent(this, "screen", "TelcoScreen");
95 95
96 // new Thread(() -> { 96 // new Thread(() -> {
97 // if (!Thread.currentThread().isInterrupted()) { 97 // if (!Thread.currentThread().isInterrupted()) {
...@@ -224,7 +224,7 @@ public class TelcoActivity extends Activity implements View.OnClickListener { ...@@ -224,7 +224,7 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
224 } 224 }
225 225
226 private void activateGift() { 226 private void activateGift() {
227 - WarplyAnalyticsManager.logTrackersEvent("click", ("ActivateTelco").concat(":").concat(mCCMS.getSessionId())); 227 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("ActivateTelco").concat(":").concat(mCCMS.getSessionId()));
228 new Thread(() -> { 228 new Thread(() -> {
229 if (!Thread.currentThread().isInterrupted()) { 229 if (!Thread.currentThread().isInterrupted()) {
230 WarplyManager.submitOrder(new CosmoteSubmitOrderRequest() 230 WarplyManager.submitOrder(new CosmoteSubmitOrderRequest()
......
...@@ -655,7 +655,7 @@ public class WarplyManagerHelper { ...@@ -655,7 +655,7 @@ public class WarplyManagerHelper {
655 analyticsEvent.setParameter("type", "gift"); 655 analyticsEvent.setParameter("type", "gift");
656 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 656 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
657 657
658 - WarplyAnalyticsManager.logTrackersEvent("click", ("Contextual").concat(":").concat(item.getSessionId())); 658 + WarplyAnalyticsManager.logTrackersEvent(context, "click", ("Contextual").concat(":").concat(item.getSessionId()));
659 Intent intent = new Intent(context, ContextualActivity.class); 659 Intent intent = new Intent(context, ContextualActivity.class);
660 intent.putExtra("ccms", item); 660 intent.putExtra("ccms", item);
661 context.startActivity(intent); 661 context.startActivity(intent);
...@@ -747,7 +747,7 @@ public class WarplyManagerHelper { ...@@ -747,7 +747,7 @@ public class WarplyManagerHelper {
747 } 747 }
748 748
749 WarpUtils.setWebviewParams(Warply.getWarplyContext(), params); 749 WarpUtils.setWebviewParams(Warply.getWarplyContext(), params);
750 - WarplyAnalyticsManager.logTrackersEvent("click", ("Contextual").concat(":").concat(item.getSessionId())); 750 + WarplyAnalyticsManager.logTrackersEvent(context, "click", ("Contextual").concat(":").concat(item.getSessionId()));
751 context.startActivity(WarpViewActivity.createIntentFromURL(context, url)); 751 context.startActivity(WarpViewActivity.createIntentFromURL(context, url));
752 break; 752 break;
753 } 753 }
...@@ -759,7 +759,7 @@ public class WarplyManagerHelper { ...@@ -759,7 +759,7 @@ public class WarplyManagerHelper {
759 analyticsEvent.setParameter("type", "gift"); 759 analyticsEvent.setParameter("type", "gift");
760 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 760 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
761 761
762 - WarplyAnalyticsManager.logTrackersEvent("click", ("Telco").concat(":").concat(item.getSessionId())); 762 + WarplyAnalyticsManager.logTrackersEvent(context, "click", ("Telco").concat(":").concat(item.getSessionId()));
763 WarplyManager.getSingleCampaign(camp.getSessionUUID()); 763 WarplyManager.getSingleCampaign(camp.getSessionUUID());
764 Intent intent = new Intent(context, TelcoActivity.class); 764 Intent intent = new Intent(context, TelcoActivity.class);
765 intent.putExtra("ccms", item); 765 intent.putExtra("ccms", item);
...@@ -803,7 +803,7 @@ public class WarplyManagerHelper { ...@@ -803,7 +803,7 @@ public class WarplyManagerHelper {
803 analyticsEvent.setParameter("type", "coupon"); 803 analyticsEvent.setParameter("type", "coupon");
804 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 804 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
805 805
806 - WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(item.getSessionUUID())); 806 + WarplyAnalyticsManager.logTrackersEvent(context, "click", ("Loyalty").concat(":").concat(item.getSessionUUID()));
807 WarplyManager.getSingleCampaign(item.getSessionUUID()); 807 WarplyManager.getSingleCampaign(item.getSessionUUID());
808 Intent intent = new Intent(context, CouponsetInfoActivity.class); 808 Intent intent = new Intent(context, CouponsetInfoActivity.class);
809 intent.putExtra("couponset", (Serializable) cpns); 809 intent.putExtra("couponset", (Serializable) cpns);
...@@ -814,7 +814,7 @@ public class WarplyManagerHelper { ...@@ -814,7 +814,7 @@ public class WarplyManagerHelper {
814 } 814 }
815 } 815 }
816 } else { 816 } else {
817 - WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(item.getSessionUUID())); 817 + WarplyAnalyticsManager.logTrackersEvent(context, "click", ("Loyalty").concat(":").concat(item.getSessionUUID()));
818 context.startActivity(WarpViewActivity.createIntentFromURL(context, WarplyManagerHelper.constructCampaignUrl(item))); 818 context.startActivity(WarpViewActivity.createIntentFromURL(context, WarplyManagerHelper.constructCampaignUrl(item)));
819 } 819 }
820 } 820 }
...@@ -839,7 +839,7 @@ public class WarplyManagerHelper { ...@@ -839,7 +839,7 @@ public class WarplyManagerHelper {
839 analyticsEvent.setParameter("type", "coupon"); 839 analyticsEvent.setParameter("type", "coupon");
840 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent)); 840 EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
841 841
842 - WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(item.getSessionUUID())); 842 + WarplyAnalyticsManager.logTrackersEvent(context, "click", ("Loyalty").concat(":").concat(item.getSessionUUID()));
843 WarplyManager.getSingleCampaign(item.getSessionUUID()); 843 WarplyManager.getSingleCampaign(item.getSessionUUID());
844 Intent intent = new Intent(context, CouponsetInfoActivity.class); 844 Intent intent = new Intent(context, CouponsetInfoActivity.class);
845 intent.putExtra("couponset", (Serializable) cpns); 845 intent.putExtra("couponset", (Serializable) cpns);
...@@ -849,7 +849,7 @@ public class WarplyManagerHelper { ...@@ -849,7 +849,7 @@ public class WarplyManagerHelper {
849 } 849 }
850 } 850 }
851 } else { 851 } else {
852 - WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(item.getSessionUUID())); 852 + WarplyAnalyticsManager.logTrackersEvent(context, "click", ("Loyalty").concat(":").concat(item.getSessionUUID()));
853 context.startActivity(WarpViewActivity.createIntentFromURL(context, WarplyManagerHelper.constructCampaignUrl(item))); 853 context.startActivity(WarpViewActivity.createIntentFromURL(context, WarplyManagerHelper.constructCampaignUrl(item)));
854 } 854 }
855 } 855 }
...@@ -860,7 +860,7 @@ public class WarplyManagerHelper { ...@@ -860,7 +860,7 @@ public class WarplyManagerHelper {
860 return; 860 return;
861 } 861 }
862 862
863 - WarplyAnalyticsManager.logTrackersEvent("click", ("Loyalty").concat(":").concat(item.getSessionUUID())); 863 + WarplyAnalyticsManager.logTrackersEvent(context, "click", ("Loyalty").concat(":").concat(item.getSessionUUID()));
864 context.startActivity(WarpViewActivity.createIntentFromURL(context, WarplyManagerHelper.constructCampaignUrl(item))); 864 context.startActivity(WarpViewActivity.createIntentFromURL(context, WarplyManagerHelper.constructCampaignUrl(item)));
865 } 865 }
866 } 866 }
......
...@@ -57,8 +57,8 @@ public class WarplyAnalyticsManager { ...@@ -57,8 +57,8 @@ 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) { 60 + public static void logTrackersEvent(Context context, String eventType, String eventName) {
61 - if (WarpUtils.getTrackersEnabled(Warply.getWarplyContext())) 61 + if (WarpUtils.getTrackersEnabled(context))
62 sendEvent(null, eventType.concat(":").concat(eventName), null, false); 62 sendEvent(null, eventType.concat(":").concat(eventName), null, false);
63 } 63 }
64 64
......