Panagiotis Triantafyllou

new keys

...@@ -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-cosbeta77' 5 + PUBLISH_VERSION = '4.5.4-cosbeta78'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
......
...@@ -473,512 +473,8 @@ public enum Warply { ...@@ -473,512 +473,8 @@ public enum Warply {
473 INSTANCE.getInboxInternal(new CallbackReceiver<CampaignList>() { 473 INSTANCE.getInboxInternal(new CallbackReceiver<CampaignList>() {
474 @Override 474 @Override
475 public void onSuccess(CampaignList result) { 475 public void onSuccess(CampaignList result) {
476 - WarplyManagerHelper.setCampaignList(result); 476 +// WarplyManagerHelper.setCampaignList(result);
477 - 477 +
478 -// ArrayList<LoyaltyContextualOfferModel> list = new ArrayList<>();
479 -// JSONArray jArray = null;
480 -// try {
481 -// jArray = new JSONArray("[\n" +
482 -// " {\n" +
483 -// " \"UACIOfferTrackingCode\": \"5166.e07.fffffffffa10663a.ffffffffda30c76a\",\n" +
484 -// " \"businessAdditionalId\": \"\",\n" +
485 -// " \"dataCategory\": \"Data\",\n" +
486 -// " \"dataValue\": \"None\",\n" +
487 -// " \"discount\": \"None\",\n" +
488 -// " \"eligibleAssets\": [\n" +
489 -// " \"306945218770\",\n" +
490 -// " \"306944333488\",\n" +
491 -// " \"306932222490\",\n" +
492 -// " \"306996824010\",\n" +
493 -// " \"306972713201\",\n" +
494 -// " \"306942496252\",\n" +
495 -// " \"306977316716\",\n" +
496 -// " \"306945433100\",\n" +
497 -// " \"306977403986\",\n" +
498 -// " \"306936581495\",\n" +
499 -// " \"306980689662\",\n" +
500 -// " \"306970101490\",\n" +
501 -// " \"306973396329\",\n" +
502 -// " \"306972577064\",\n" +
503 -// " \"306974923219\",\n" +
504 -// " \"306977513761\",\n" +
505 -// " \"306984220987\",\n" +
506 -// " \"306979949205\",\n" +
507 -// " \"306943134127\",\n" +
508 -// " \"306970437794\",\n" +
509 -// " \"306932535319\",\n" +
510 -// " \"306974063133\",\n" +
511 -// " \"306932520323\",\n" +
512 -// " \"306978733823\",\n" +
513 -// " \"306985995420\",\n" +
514 -// " \"306983879555\",\n" +
515 -// " ],\n" +
516 -// " \"id\": \"000003590\",\n" +
517 -// " \"loyaltyCampaignId\": \"NA\",\n" +
518 -// " \"minsValue\": \"None\",\n" +
519 -// " \"noOfRecurrance\": \"None\",\n" +
520 -// " \"notificationMessage\": \"None\",\n" +
521 -// " \"offerAudienceLevel\": \"msisdn\",\n" +
522 -// " \"offerCode1\": \"000003590\",\n" +
523 -// " \"offerName\": \"CCMS loyalty white label\",\n" +
524 -// " \"price\": \"None\",\n" +
525 -// " \"productType\": \"White Label\",\n" +
526 -// " \"provDuration\": \"0.0\",\n" +
527 -// " \"provStepValueMins\": \"None\",\n" +
528 -// " \"score\": \"50\",\n" +
529 -// " \"treatmentCode\": \"5166.e07.fffffffffa10663a.ffffffffda30c76a\",\n" +
530 -// " \"validity\": \"0\",\n" +
531 -// " \"voiceCategory\": \"None\",\n" +
532 -// " \"wave\": \"1\",\n" +
533 -// " \"zone\": \"COSMOTE_APP_LOYALTY_PROMO\"\n" +
534 -// " },\n" +
535 -// " {\n" +
536 -// " \"UACIOfferTrackingCode\": \"51ed.e10.2c006f18.71e96d08\",\n" +
537 -// " \"businessAdditionalId\": \"\",\n" +
538 -// " \"dataCategory\": \"Data\",\n" +
539 -// " \"dataValue\": \"233\",\n" +
540 -// " \"discount\": \"None\",\n" +
541 -// " \"eligibleAssets\": [\n" +
542 -// " \"306945218770\",\n" +
543 -// " \"306944333488\",\n" +
544 -// " \"306932222490\",\n" +
545 -// " \"306996824010\",\n" +
546 -// " \"306972713201\",\n" +
547 -// " \"306942496252\",\n" +
548 -// " \"306977316716\",\n" +
549 -// " \"306945433100\",\n" +
550 -// " \"306977403986\",\n" +
551 -// " \"306936581495\",\n" +
552 -// " \"306980689662\",\n" +
553 -// " \"306970101490\",\n" +
554 -// " \"306973396329\",\n" +
555 -// " \"306972577064\",\n" +
556 -// " \"306974923219\",\n" +
557 -// " \"306977513761\",\n" +
558 -// " \"306984220987\",\n" +
559 -// " \"306979949205\",\n" +
560 -// " \"306943134127\",\n" +
561 -// " \"306970437794\",\n" +
562 -// " \"306932535319\",\n" +
563 -// " \"306974063133\",\n" +
564 -// " \"306932520323\",\n" +
565 -// " \"306978733823\",\n" +
566 -// " \"306985995420\",\n" +
567 -// " \"306983879555\",\n" +
568 -// " ],\n" +
569 -// " \"id\": \"000003599\",\n" +
570 -// " \"loyaltyCampaignId\": \"9a92d445956145f6bbc5cd20cef543b9\",\n" + //c5cc5f4f65624f47a580b720233fa60d
571 -// " \"minsValue\": \"None\",\n" +
572 -// " \"noOfRecurrance\": \"None\",\n" +
573 -// " \"notificationMessage\": \"None\",\n" +
574 -// " \"offerAudienceLevel\": \"msisdn\",\n" +
575 -// " \"offerCode1\": \"000003599\",\n" +
576 -// " \"offerName\": \"CCMS loyalty white label with campaignId\",\n" +
577 -// " \"price\": \"None\",\n" +
578 -// " \"productType\": \"White Label\",\n" +
579 -// " \"provDuration\": \"0.0\",\n" +
580 -// " \"provStepValueMins\": \"None\",\n" +
581 -// " \"score\": \"50\",\n" +
582 -// " \"treatmentCode\": \"51ed.e10.2c006f18.71e96d08\",\n" +
583 -// " \"validity\": \"0\",\n" +
584 -// " \"voiceCategory\": \"None\",\n" +
585 -// " \"wave\": \"1\",\n" +
586 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
587 -// " \"title\": \"Test1\",\n" +
588 -// " \"subtitle\": \"Test1\",\n" +
589 -// " \"description\": \"Test1\",\n" +
590 -// " \"zone\": \"COSMOTE_APP_LOYALTY_PROMO\"\n" +
591 -// " },\n" +
592 -// " {\n" +
593 -// " \"UACIOfferTrackingCode\": \"516c.e05.ffffffffa943695b.79ff470b\",\n" +
594 -// " \"businessAdditionalId\": \"\",\n" +
595 -// " \"businessService\": \"0.0\",\n" +
596 -// " \"eligibleAssets\": [\n" +
597 -// " \"306945218770\",\n" +
598 -// " \"306944333488\",\n" +
599 -// " \"306932222490\",\n" +
600 -// " \"306996824010\",\n" +
601 -// " \"306972713201\",\n" +
602 -// " \"306942496252\",\n" +
603 -// " \"306977316716\",\n" +
604 -// " \"306945433100\",\n" +
605 -// " \"306977403986\",\n" +
606 -// " \"306936581495\",\n" +
607 -// " \"306980689662\",\n" +
608 -// " \"306970101490\",\n" +
609 -// " \"306973396329\",\n" +
610 -// " \"306972577064\",\n" +
611 -// " \"306974923219\",\n" +
612 -// " \"306977513761\",\n" +
613 -// " \"306984220987\",\n" +
614 -// " \"306979949205\",\n" +
615 -// " \"306943134127\",\n" +
616 -// " \"306970437794\",\n" +
617 -// " \"306932535319\",\n" +
618 -// " \"306974063133\",\n" +
619 -// " \"306932520323\",\n" +
620 -// " \"306978733823\",\n" +
621 -// " \"306985995420\",\n" +
622 -// " \"306983879555\",\n" +
623 -// " ],\n" +
624 -// " \"id\": \"000003588\",\n" +
625 -// " \"loyaltyCampaignId\": \"NA\",\n" +
626 -// " \"noOfRecurrance\": \"0\",\n" +
627 -// " \"notificationMessage\": \"None\",\n" +
628 -// " \"offerAudienceLevel\": \"msisdn\",\n" +
629 -// " \"offerCode1\": \"000003588\",\n" +
630 -// " \"offerName\": \"CCMS loyalty postpay addon\",\n" +
631 -// " \"postpayProduct\": \"0.0\",\n" +
632 -// " \"price\": \"None\",\n" +
633 -// " \"productType\": \"MOBILE ADDON\",\n" +
634 -// " \"provDuration\": \"0.0\",\n" +
635 -// " \"score\": \"50\",\n" +
636 -// " \"treatmentCode\": \"516c.e05.ffffffffa943695b.79ff470b\",\n" +
637 -// " \"validity\": \"0\",\n" +
638 -// " \"wave\": \"1\",\n" +
639 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
640 -// " \"title\": \"Test2\",\n" +
641 -// " \"subtitle\": \"Test2\",\n" +
642 -// " \"description\": \"Test2\",\n" +
643 -// " \"zone\": \"COSMOTE_APP_LOYALTY_PROMO\"\n" +
644 -// " },\n" +
645 -// " {\n" +
646 -// " \"UACIOfferTrackingCode\": \"5224.e19.30e2f27b.ffffffffeb22b0db\",\n" +
647 -// " \"businessAdditionalId\": \"\",\n" +
648 -// " \"dataCategory\": \"Data\",\n" +
649 -// " \"dataValue\": \"None\",\n" +
650 -// " \"discount\": \"None\",\n" +
651 -// " \"eligibleAssets\": [\n" +
652 -// " \"306945218770\",\n" +
653 -// " \"306944333488\",\n" +
654 -// " \"306932222490\",\n" +
655 -// " \"306996824010\",\n" +
656 -// " \"306972713201\",\n" +
657 -// " \"306942496252\",\n" +
658 -// " \"306977316716\",\n" +
659 -// " \"306945433100\",\n" +
660 -// " \"306977403986\",\n" +
661 -// " \"306936581495\",\n" +
662 -// " \"306980689662\",\n" +
663 -// " \"306970101490\",\n" +
664 -// " \"306973396329\",\n" +
665 -// " \"306972577064\",\n" +
666 -// " \"306974923219\",\n" +
667 -// " \"306977513761\",\n" +
668 -// " \"306984220987\",\n" +
669 -// " \"306979949205\",\n" +
670 -// " \"306943134127\",\n" +
671 -// " \"306970437794\",\n" +
672 -// " \"306932535319\",\n" +
673 -// " \"306974063133\",\n" +
674 -// " \"306932520323\",\n" +
675 -// " \"306978733823\",\n" +
676 -// " \"306985995420\",\n" +
677 -// " \"306983879555\",\n" +
678 -// " ],\n" +
679 -// " \"id\": \"000003608\",\n" +
680 -// " \"loyaltyCampaignId\": \"c134cdeb8a924f8eac38e261acb9caf5\",\n" +
681 -// " \"minsValue\": \"None\",\n" +
682 -// " \"noOfRecurrance\": \"None\",\n" +
683 -// " \"notificationMessage\": \"None\",\n" +
684 -// " \"offerAudienceLevel\": \"msisdn\",\n" +
685 -// " \"offerCode1\": \"000003608\",\n" +
686 -// " \"offerName\": \"CCMS loyalty gifts4u v1\",\n" +
687 -// " \"price\": \"None\",\n" +
688 -// " \"productType\": \"White Label\",\n" +
689 -// " \"provDuration\": \"0.0\",\n" +
690 -// " \"provStepValueMins\": \"None\",\n" +
691 -// " \"score\": \"50\",\n" +
692 -// " \"treatmentCode\": \"5224.e19.30e2f27b.ffffffffeb22b0db\",\n" +
693 -// " \"validity\": \"0\",\n" +
694 -// " \"voiceCategory\": \"None\",\n" +
695 -// " \"wave\": \"1\",\n" +
696 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
697 -// " \"title\": \"Test3\",\n" +
698 -// " \"subtitle\": \"Test3\",\n" +
699 -// " \"description\": \"Test3\",\n" +
700 -// " \"zone\": \"COSMOTE_APP_GIFTS4U\"\n" +
701 -// " },\n" +
702 -// " {\n" +
703 -// " \"UACIOfferTrackingCode\": \"5228.e1d.38378e61.750186c1\",\n" +
704 -// " \"businessAdditionalId\": \"\",\n" +
705 -// " \"businessService\": \"0.0\",\n" +
706 -// " \"eligibleAssets\": [\n" +
707 -// " \"306945218770\",\n" +
708 -// " \"306944333488\",\n" +
709 -// " \"306932222490\",\n" +
710 -// " \"306996824010\",\n" +
711 -// " \"306972713201\",\n" +
712 -// " \"306942496252\",\n" +
713 -// " \"306977316716\",\n" +
714 -// " \"306945433100\",\n" +
715 -// " \"306977403986\",\n" +
716 -// " \"306936581495\",\n" +
717 -// " \"306980689662\",\n" +
718 -// " \"306970101490\",\n" +
719 -// " \"306973396329\",\n" +
720 -// " \"306972577064\",\n" +
721 -// " \"306974923219\",\n" +
722 -// " \"306977513761\",\n" +
723 -// " \"306984220987\",\n" +
724 -// " \"306979949205\",\n" +
725 -// " \"306943134127\",\n" +
726 -// " \"306970437794\",\n" +
727 -// " \"306932535319\",\n" +
728 -// " \"306974063133\",\n" +
729 -// " \"306932520323\",\n" +
730 -// " \"306978733823\",\n" +
731 -// " \"306985995420\",\n" +
732 -// " \"306983879555\",\n" +
733 -// " ],\n" +
734 -// " \"id\": \"000003612\",\n" +
735 -// " \"loyaltyCampaignId\": \"8eb71c4ceaff409c896e2d1f6f1c20f3\",\n" +
736 -// " \"noOfRecurrance\": \"0\",\n" +
737 -// " \"notificationMessage\": \"None\",\n" +
738 -// " \"offerAudienceLevel\": \"msisdn\",\n" +
739 -// " \"offerCode1\": \"000003612\",\n" +
740 -// " \"offerName\": \"CCMS loyalty - postpay addon gifts4u\",\n" +
741 -// " \"postpayProduct\": \"0.0\",\n" +
742 -// " \"price\": \"None\",\n" +
743 -// " \"productType\": \"MOBILE ADDON\",\n" +
744 -// " \"provDuration\": \"0.0\",\n" +
745 -// " \"score\": \"50\",\n" +
746 -// " \"treatmentCode\": \"5228.e1d.38378e61.750186c1\",\n" +
747 -// " \"validity\": \"0\",\n" +
748 -// " \"wave\": \"1\",\n" +
749 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
750 -// " \"title\": \"Test4\",\n" +
751 -// " \"subtitle\": \"Test4\",\n" +
752 -// " \"description\": \"Test4\",\n" +
753 -// " \"zone\": \"COSMOTE_APP_GIFTS4U\"\n" +
754 -// " },\n" +
755 -// " {\n" +
756 -// " \"UACIOfferTrackingCode\": \"5222.e1b.ffffffffe725d1b3.ffffffffed6d8723\",\n" +
757 -// " \"businessAdditionalId\": \"\",\n" +
758 -// " \"dataCategory\": \"Data\",\n" +
759 -// " \"dataValue\": \"None\",\n" +
760 -// " \"discount\": \"None\",\n" +
761 -// " \"eligibleAssets\": [\n" +
762 -// " \"306945218770\",\n" +
763 -// " \"306944333488\",\n" +
764 -// " \"306932222490\",\n" +
765 -// " \"306996824010\",\n" +
766 -// " \"306972713201\",\n" +
767 -// " \"306942496252\",\n" +
768 -// " \"306977316716\",\n" +
769 -// " \"306945433100\",\n" +
770 -// " \"306977403986\",\n" +
771 -// " \"306936581495\",\n" +
772 -// " \"306980689662\",\n" +
773 -// " \"306970101490\",\n" +
774 -// " \"306973396329\",\n" +
775 -// " \"306972577064\",\n" +
776 -// " \"306974923219\",\n" +
777 -// " \"306977513761\",\n" +
778 -// " \"306984220987\",\n" +
779 -// " \"306979949205\",\n" +
780 -// " \"306943134127\",\n" +
781 -// " \"306970437794\",\n" +
782 -// " \"306932535319\",\n" +
783 -// " \"306974063133\",\n" +
784 -// " \"306932520323\",\n" +
785 -// " \"306978733823\",\n" +
786 -// " \"306985995420\",\n" +
787 -// " \"306983879555\",\n" +
788 -// " ],\n" +
789 -// " \"id\": \"000003610\",\n" +
790 -// " \"loyaltyCampaignId\": \"8e2c88ec94c948d8b51577324ed9a4d5\",\n" +
791 -// " \"minsValue\": \"None\",\n" +
792 -// " \"noOfRecurrance\": \"None\",\n" +
793 -// " \"notificationMessage\": \"None\",\n" +
794 -// " \"offerAudienceLevel\": \"msisdn\",\n" +
795 -// " \"offerCode1\": \"000003610\",\n" +
796 -// " \"offerName\": \"CCMS loyalty more4u v1\",\n" +
797 -// " \"price\": \"20\",\n" +
798 -// " \"productType\": \"White Label\",\n" +
799 -// " \"provDuration\": \"7.0\",\n" +
800 -// " \"provStepValueMins\": \"None\",\n" +
801 -// " \"score\": \"60\",\n" +
802 -// " \"treatmentCode\": \"5222.e1b.ffffffffe725d1b3.ffffffffed6d8723\",\n" +
803 -// " \"validity\": \"0\",\n" +
804 -// " \"voiceCategory\": \"None\",\n" +
805 -// " \"wave\": \"1\",\n" +
806 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
807 -// " \"title\": \"Test5\",\n" +
808 -// " \"subtitle\": \"Test5\",\n" +
809 -// " \"description\": \"Test5\",\n" +
810 -// " \"zone\": \"COSMOTE_APP_MORE4U\"\n" +
811 -// " },\n" +
812 -// " {\n" +
813 -// " \"UACIOfferTrackingCode\": \"5226.e1f.728b68c6.ffffffffa6c7b10e\",\n" +
814 -// " \"businessAdditionalId\": \"\",\n" +
815 -// " \"businessService\": \"0.0\",\n" +
816 -// " \"eligibleAssets\": [\n" +
817 -// " \"306945218770\",\n" +
818 -// " \"306944333488\",\n" +
819 -// " \"306932222490\",\n" +
820 -// " \"306996824010\",\n" +
821 -// " \"306972713201\",\n" +
822 -// " \"306942496252\",\n" +
823 -// " \"306977316716\",\n" +
824 -// " \"306945433100\",\n" +
825 -// " \"306977403986\",\n" +
826 -// " \"306936581495\",\n" +
827 -// " \"306980689662\",\n" +
828 -// " \"306970101490\",\n" +
829 -// " \"306973396329\",\n" +
830 -// " \"306972577064\",\n" +
831 -// " \"306974923219\",\n" +
832 -// " \"306977513761\",\n" +
833 -// " \"306984220987\",\n" +
834 -// " \"306979949205\",\n" +
835 -// " \"306943134127\",\n" +
836 -// " \"306970437794\",\n" +
837 -// " \"306932535319\",\n" +
838 -// " \"306974063133\",\n" +
839 -// " \"306932520323\",\n" +
840 -// " \"306978733823\",\n" +
841 -// " \"306985995420\",\n" +
842 -// " \"306983879555\",\n" +
843 -// " ],\n" +
844 -// " \"id\": \"000003614\",\n" +
845 -// " \"loyaltyCampaignId\": \"aaf4022194584f02bb84c7b283c7c51e\",\n" +
846 -// " \"noOfRecurrance\": \"0\",\n" +
847 -// " \"notificationMessage\": \"None\",\n" +
848 -// " \"offerAudienceLevel\": \"msisdn\",\n" +
849 -// " \"offerCode1\": \"000003614\",\n" +
850 -// " \"offerName\": \"CCMS loyalty - postpay addon more4u\",\n" +
851 -// " \"postpayProduct\": \"0.0\",\n" +
852 -// " \"price\": \"None\",\n" +
853 -// " \"productType\": \"MOBILE ADDON\",\n" +
854 -// " \"provDuration\": \"0.0\",\n" +
855 -// " \"score\": \"50\",\n" +
856 -// " \"treatmentCode\": \"5226.e1f.728b68c6.ffffffffa6c7b10e\",\n" +
857 -// " \"validity\": \"0\",\n" +
858 -// " \"wave\": \"1\",\n" +
859 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
860 -// " \"title\": \"Test6\",\n" +
861 -// " \"subtitle\": \"Test6\",\n" +
862 -// " \"description\": \"Test6\",\n" +
863 -// " \"zone\": \"COSMOTE_APP_MORE4U\"\n" +
864 -// " },\n" +
865 -// " {\n" +
866 -// " \"UACIOfferTrackingCode\": \"5154.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
867 -// " \"businessAdditionalId\": \"\",\n" +
868 -// " \"eligibleAssets\": [],\n" +
869 -// " \"id\": \"000003586\",\n" +
870 -// " \"loyaltyCampaignId\": \"NA\",\n" +
871 -// " \"offerAudienceLevel\": \"guid\",\n" +
872 -// " \"offerCode1\": \"000003586\",\n" +
873 -// " \"offerName\": \"CCMS loyalty offer 6\",\n" +
874 -// " \"productType\": \"GENERIC\",\n" +
875 -// " \"score\": \"50\",\n" +
876 -// " \"treatmentCode\": \"5154.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
877 -// " \"validity\": \"0\",\n" +
878 -// " \"zone\": \"COSMOTE_APP_LOYALTY_PROMO\"\n" +
879 -// " },\n" +
880 -// " {\n" +
881 -// " \"UACIOfferTrackingCode\": \"51d2.e0c.291f49d9.40d5a689\",\n" +
882 -// " \"businessAdditionalId\": \"\",\n" +
883 -// " \"eligibleAssets\": [],\n" +
884 -// " \"id\": \"000003595\",\n" +
885 -// " \"loyaltyCampaignId\": \"c5cc5f4f65624f47a580b720233fa60d\",\n" +
886 -// " \"offerAudienceLevel\": \"guid\",\n" +
887 -// " \"offerCode1\": \"000003595\",\n" +
888 -// " \"offerName\": \"CCMS Loyal offer campaignId\",\n" +
889 -// " \"productType\": \"GENERIC\",\n" +
890 -// " \"score\": \"50\",\n" +
891 -// " \"treatmentCode\": \"51d2.e0c.291f49d9.40d5a689\",\n" +
892 -// " \"validity\": \"0\",\n" +
893 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
894 -// " \"title\": \"Test7\",\n" +
895 -// " \"subtitle\": \"Test7\",\n" +
896 -// " \"description\": \"Test7\",\n" +
897 -// " \"zone\": \"COSMOTE_APP_LOYALTY_PROMO\"\n" +
898 -// " },\n" +
899 -// " {\n" +
900 -// " \"UACIOfferTrackingCode\": \"51d6.e0c.291f49d9.40d5a689\",\n" +
901 -// " \"businessAdditionalId\": \"\",\n" +
902 -// " \"eligibleAssets\": [],\n" +
903 -// " \"id\": \"000003595\",\n" +
904 -// " \"loyaltyCampaignId\": \"c5cc5f4f65624f47a580b720233fa60d\",\n" +
905 -// " \"offerAudienceLevel\": \"guid\",\n" +
906 -// " \"offerCode1\": \"000003595\",\n" +
907 -// " \"offerName\": \"CCMS Loyal offer campaignId\",\n" +
908 -// " \"productType\": \"GENERIC\",\n" +
909 -// " \"score\": \"50\",\n" +
910 -// " \"treatmentCode\": \"51d6.e0c.291f49d9.40d5a689\",\n" +
911 -// " \"validity\": \"0\",\n" +
912 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
913 -// " \"title\": \"Test8\",\n" +
914 -// " \"subtitle\": \"Test8\",\n" +
915 -// " \"description\": \"Test8\",\n" +
916 -// " \"zone\": \"COSMOTE_APP_GIFTS4U\"\n" +
917 -// " },\n" +
918 -// " {\n" +
919 -// " \"UACIOfferTrackingCode\": \"5150.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
920 -// " \"businessAdditionalId\": \"\",\n" +
921 -// " \"eligibleAssets\": [],\n" +
922 -// " \"id\": \"000003586\",\n" +
923 -// " \"loyaltyCampaignId\": \"NA\",\n" +
924 -// " \"offerAudienceLevel\": \"guid\",\n" +
925 -// " \"offerCode1\": \"000003586\",\n" +
926 -// " \"offerName\": \"CCMS loyalty offer 6\",\n" +
927 -// " \"productType\": \"GENERIC\",\n" +
928 -// " \"score\": \"50\",\n" +
929 -// " \"treatmentCode\": \"5150.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
930 -// " \"validity\": \"0\",\n" +
931 -// " \"zone\": \"COSMOTE_APP_GIFTS4U\"\n" +
932 -// " },\n" +
933 -// " {\n" +
934 -// " \"UACIOfferTrackingCode\": \"5152.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
935 -// " \"businessAdditionalId\": \"\",\n" +
936 -// " \"eligibleAssets\": [],\n" +
937 -// " \"id\": \"000003586\",\n" +
938 -// " \"loyaltyCampaignId\": \"NA\",\n" +
939 -// " \"offerAudienceLevel\": \"guid\",\n" +
940 -// " \"offerCode1\": \"000003586\",\n" +
941 -// " \"offerName\": \"CCMS loyalty offer 6\",\n" +
942 -// " \"productType\": \"GENERIC\",\n" +
943 -// " \"score\": \"50\",\n" +
944 -// " \"treatmentCode\": \"5152.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
945 -// " \"validity\": \"0\",\n" +
946 -// " \"zone\": \"COSMOTE_APP_MORE4U\"\n" +
947 -// " },\n" +
948 -// " {\n" +
949 -// " \"UACIOfferTrackingCode\": \"51d4.e0c.291f49d9.40d5a689\",\n" +
950 -// " \"businessAdditionalId\": \"\",\n" +
951 -// " \"eligibleAssets\": [],\n" +
952 -// " \"id\": \"000003595\",\n" +
953 -// " \"loyaltyCampaignId\": \"c5cc5f4f65624f47a580b720233fa60d\",\n" +
954 -// " \"offerAudienceLevel\": \"guid\",\n" +
955 -// " \"offerCode1\": \"000003595\",\n" +
956 -// " \"offerName\": \"CCMS Loyal offer campaignId\",\n" +
957 -// " \"productType\": \"GENERIC\",\n" +
958 -// " \"score\": \"50\",\n" +
959 -// " \"treatmentCode\": \"51d4.e0c.291f49d9.40d5a689\",\n" +
960 -// " \"validity\": \"0\",\n" +
961 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
962 -// " \"title\": \"Test9\",\n" +
963 -// " \"subtitle\": \"Test9\",\n" +
964 -// " \"description\": \"Test9\",\n" +
965 -// " \"zone\": \"COSMOTE_APP_MORE4U\"\n" +
966 -// " }\n" +
967 -// " ]");
968 -// } catch (JSONException e) {
969 -// e.printStackTrace();
970 -// }
971 -// if (jArray != null && jArray.length() > 0) {
972 -// for (int i = 0; i < jArray.length(); i++) {
973 -// JSONObject jobj = new JSONObject();
974 -// jobj = jArray.optJSONObject(i);
975 -// if (jobj != null) {
976 -// LoyaltyContextualOfferModel model = new LoyaltyContextualOfferModel(jobj);
977 -// list.add(model);
978 -// }
979 -// }
980 -// }
981 -// WarplyManagerHelper.setCCMSLoyaltyCampaigns(list);
982 478
983 if (result.size() >= 0) { 479 if (result.size() >= 0) {
984 objectSerializer.serialize(result, File.separator + requestSignature); 480 objectSerializer.serialize(result, File.separator + requestSignature);
...@@ -1001,7 +497,7 @@ public enum Warply { ...@@ -1001,7 +497,7 @@ public enum Warply {
1001 497
1002 INSTANCE.mLastReceivedCampaigns = result; 498 INSTANCE.mLastReceivedCampaigns = result;
1003 if (receiver != null) { 499 if (receiver != null) {
1004 - receiver.onSuccess(/*result*/campaignLoyaltyList); 500 + receiver.onSuccess(result/*campaignLoyaltyList*/);
1005 } 501 }
1006 } 502 }
1007 } 503 }
...@@ -1611,8 +1107,11 @@ public enum Warply { ...@@ -1611,8 +1107,11 @@ public enum Warply {
1611 return; 1107 return;
1612 } 1108 }
1613 1109
1110 +// if (WarplyDBHelper.getInstance(mContext.get()).isForceRequestsExist()
1111 +// || (requestsInQueue >= MINIMUM_REQUESTS_FOR_SENDING)) {
1112 +
1614 if (WarplyDBHelper.getInstance(mContext.get()).isForceRequestsExist() 1113 if (WarplyDBHelper.getInstance(mContext.get()).isForceRequestsExist()
1615 - || (requestsInQueue >= MINIMUM_REQUESTS_FOR_SENDING)) { 1114 + || (requestsInQueue > 0)) {
1616 1115
1617 WarpUtils.log("Waking post task!"); 1116 WarpUtils.log("Waking post task!");
1618 wakeSendingTask(); 1117 wakeSendingTask();
......
...@@ -317,7 +317,7 @@ public class WarpViewActivity extends WarpBaseActivity { ...@@ -317,7 +317,7 @@ public class WarpViewActivity extends WarpBaseActivity {
317 317
318 private void sendSteps() { 318 private void sendSteps() {
319 String date = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss", Locale.getDefault()).format(new Date()); 319 String date = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss", Locale.getDefault()).format(new Date());
320 - 320 + WarpUtils.log("SEND_STEPS: " + String.valueOf(WarpUtils.getStepsCounter(this)));
321 if (WarpUtils.getStepsCounter(this) > 0) { 321 if (WarpUtils.getStepsCounter(this) > 0) {
322 WarplyManager.setPacingDetails(new PacingCalculateRequest() 322 WarplyManager.setPacingDetails(new PacingCalculateRequest()
323 .setCounter(WarpUtils.getStepsCounter(this)) 323 .setCounter(WarpUtils.getStepsCounter(this))
......
...@@ -213,13 +213,16 @@ public class WarplyHealthService extends Service implements SensorEventListener ...@@ -213,13 +213,16 @@ public class WarplyHealthService extends Service implements SensorEventListener
213 && (timeNs - lastStepTimeNs > STEP_DELAY_NS)) { 213 && (timeNs - lastStepTimeNs > STEP_DELAY_NS)) {
214 WarplyManagerHelper.mStepsWebview++; 214 WarplyManagerHelper.mStepsWebview++;
215 sumSteps++; 215 sumSteps++;
216 - WarplyManagerHelper.mSteps += WarplyManagerHelper.mStepsWebview; 216 + WarplyManagerHelper.mSteps++;
217 + WarpUtils.log("COUNT_STEPS: " + String.valueOf(WarplyManagerHelper.mSteps));
217 WarpUtils.setStepsCounter(this, WarplyManagerHelper.mSteps); 218 WarpUtils.setStepsCounter(this, WarplyManagerHelper.mSteps);
218 WarplyManagerHelper.mMetersWebview = (WarplyManagerHelper.mStepsWebview * 0.762); 219 WarplyManagerHelper.mMetersWebview = (WarplyManagerHelper.mStepsWebview * 0.762);
220 + WarpUtils.log("WEBVIEW_METERS: " + String.valueOf(WarplyManagerHelper.mMetersWebview));
219 HealthEventModel healthSteps = new HealthEventModel(); 221 HealthEventModel healthSteps = new HealthEventModel();
220 // healthSteps.setMeters((mStepsAll * 0.762)); // 16/09/2022 222 // healthSteps.setMeters((mStepsAll * 0.762)); // 16/09/2022
221 // healthSteps.setMeters(WarplyManagerHelper.mMetersWebview); // 20/09/2022 223 // healthSteps.setMeters(WarplyManagerHelper.mMetersWebview); // 20/09/2022
222 eventMeters = (sumSteps * 0.762); 224 eventMeters = (sumSteps * 0.762);
225 + WarpUtils.log("WIDGET_METERS: " + String.valueOf(eventMeters));
223 healthSteps.setMeters(eventMeters); 226 healthSteps.setMeters(eventMeters);
224 EventBus.getDefault().post(new WarplyEventBusManager(healthSteps)); 227 EventBus.getDefault().post(new WarplyEventBusManager(healthSteps));
225 228
......
...@@ -46,7 +46,9 @@ import java.io.Serializable; ...@@ -46,7 +46,9 @@ import java.io.Serializable;
46 import java.util.ArrayList; 46 import java.util.ArrayList;
47 import java.util.HashMap; 47 import java.util.HashMap;
48 import java.util.HashSet; 48 import java.util.HashSet;
49 +import java.util.LinkedHashSet;
49 import java.util.Map; 50 import java.util.Map;
51 +import java.util.Set;
50 52
51 import ly.warp.sdk.R; 53 import ly.warp.sdk.R;
52 import ly.warp.sdk.Warply; 54 import ly.warp.sdk.Warply;
...@@ -105,8 +107,8 @@ public class WarplyManagerHelper { ...@@ -105,8 +107,8 @@ public class WarplyManagerHelper {
105 private static CouponList mCouponListExpired = new CouponList(); 107 private static CouponList mCouponListExpired = new CouponList();
106 private static CouponsetsList mCouponsetsList = new CouponsetsList(); 108 private static CouponsetsList mCouponsetsList = new CouponsetsList();
107 private static CustomerStateModel mCustomerStateModel = new CustomerStateModel(); 109 private static CustomerStateModel mCustomerStateModel = new CustomerStateModel();
108 - private static CampaignList mCampaignList = new CampaignList(); 110 + private static ArrayList<Campaign> mCampaignList = new ArrayList<Campaign>();
109 - private static CampaignList mCampaignListAll = new CampaignList(); 111 + private static ArrayList<Campaign> mCampaignListAll = new ArrayList<Campaign>();
110 private static ArrayList<Campaign> mCarouselList = new ArrayList<Campaign>(); 112 private static ArrayList<Campaign> mCarouselList = new ArrayList<Campaign>();
111 private static ArrayList<ActiveDFYCouponModel> mDfyCoupons = new ArrayList(); 113 private static ArrayList<ActiveDFYCouponModel> mDfyCoupons = new ArrayList();
112 private static ArrayList<LoyaltyGiftsForYouPackage> mSeasonalList = new ArrayList<>(); 114 private static ArrayList<LoyaltyGiftsForYouPackage> mSeasonalList = new ArrayList<>();
...@@ -1077,7 +1079,7 @@ public class WarplyManagerHelper { ...@@ -1077,7 +1079,7 @@ public class WarplyManagerHelper {
1077 return mCouponListExpired; 1079 return mCouponListExpired;
1078 } 1080 }
1079 1081
1080 - public static void setUniqueCampaignList(CampaignList campaignList) { 1082 + public static void setUniqueCampaignList(ArrayList<Campaign> campaignList) {
1081 mCampaignList.clear(); 1083 mCampaignList.clear();
1082 mCampaignList.addAll(campaignList); 1084 mCampaignList.addAll(campaignList);
1083 1085
...@@ -1097,12 +1099,12 @@ public class WarplyManagerHelper { ...@@ -1097,12 +1099,12 @@ public class WarplyManagerHelper {
1097 // } 1099 // }
1098 } 1100 }
1099 1101
1100 - public static void setCampaignList(CampaignList campaignList) { 1102 + public static void setCampaignList(ArrayList<Campaign> campaignList) {
1101 // mCampaignList.clear(); 1103 // mCampaignList.clear();
1102 // mCampaignList.addAll(campaignList); 1104 // mCampaignList.addAll(campaignList);
1103 - 1105 + Set<Campaign> set = new LinkedHashSet<>(campaignList);
1104 mCampaignListAll.clear(); 1106 mCampaignListAll.clear();
1105 - mCampaignListAll.addAll(campaignList); 1107 + mCampaignListAll.addAll(set);
1106 1108
1107 mCampaignList.clear(); 1109 mCampaignList.clear();
1108 for (Campaign camp : campaignList) { 1110 for (Campaign camp : campaignList) {
...@@ -1132,11 +1134,11 @@ public class WarplyManagerHelper { ...@@ -1132,11 +1134,11 @@ public class WarplyManagerHelper {
1132 return mCarouselList; 1134 return mCarouselList;
1133 } 1135 }
1134 1136
1135 - public static CampaignList getCampaignList() { 1137 + public static ArrayList<Campaign> getCampaignList() {
1136 return mCampaignList; 1138 return mCampaignList;
1137 } 1139 }
1138 1140
1139 - public static CampaignList getCampaignListAll() { 1141 + public static ArrayList<Campaign> getCampaignListAll() {
1140 return mCampaignListAll; 1142 return mCampaignListAll;
1141 } 1143 }
1142 1144
......
...@@ -45,6 +45,8 @@ import java.util.ArrayList; ...@@ -45,6 +45,8 @@ import java.util.ArrayList;
45 import java.util.Collections; 45 import java.util.Collections;
46 import java.util.Comparator; 46 import java.util.Comparator;
47 import java.util.Date; 47 import java.util.Date;
48 +import java.util.LinkedHashSet;
49 +import java.util.Set;
48 50
49 import ly.warp.sdk.R; 51 import ly.warp.sdk.R;
50 import ly.warp.sdk.Warply; 52 import ly.warp.sdk.Warply;
...@@ -147,7 +149,7 @@ import ly.warp.sdk.utils.constants.WarpConstants; ...@@ -147,7 +149,7 @@ import ly.warp.sdk.utils.constants.WarpConstants;
147 */ 149 */
148 150
149 public class WarplyManager { 151 public class WarplyManager {
150 - private static CampaignList mNewCampaignList = new CampaignList(); 152 + private static ArrayList<Campaign> mNewCampaignList = new ArrayList<Campaign>();
151 153
152 public static void getProducts(WarplyProductsRequest request, final CallbackReceiver<ProductList> receiver) { 154 public static void getProducts(WarplyProductsRequest request, final CallbackReceiver<ProductList> receiver) {
153 // String productCategory = ""; 155 // String productCategory = "";
...@@ -1372,7 +1374,8 @@ public class WarplyManager { ...@@ -1372,7 +1374,8 @@ public class WarplyManager {
1372 public void onSuccess(CampaignList result) { 1374 public void onSuccess(CampaignList result) {
1373 // receiver.onSuccess(result); 1375 // receiver.onSuccess(result);
1374 mNewCampaignList.clear(); 1376 mNewCampaignList.clear();
1375 - mNewCampaignList.addAll(result); 1377 + ArrayList<Campaign> tempCamps = new ArrayList<Campaign>(result);
1378 + mNewCampaignList.addAll(tempCamps);
1376 getCampaignsPersonalized(request, new CallbackReceiver<CampaignList>() { 1379 getCampaignsPersonalized(request, new CallbackReceiver<CampaignList>() {
1377 @Override 1380 @Override
1378 public void onSuccess(CampaignList resultPersonalized) { 1381 public void onSuccess(CampaignList resultPersonalized) {
...@@ -1402,7 +1405,8 @@ public class WarplyManager { ...@@ -1402,7 +1405,8 @@ public class WarplyManager {
1402 Warply.postReceiveMicroappData(WarpConstants.MICROAPP_NEW_CAMPAIGNS, true, "campaignsPersonalized", request.toJson(), new NewCampaignsHook(new CallbackReceiver<CampaignList>() { 1405 Warply.postReceiveMicroappData(WarpConstants.MICROAPP_NEW_CAMPAIGNS, true, "campaignsPersonalized", request.toJson(), new NewCampaignsHook(new CallbackReceiver<CampaignList>() {
1403 @Override 1406 @Override
1404 public void onSuccess(CampaignList result) { 1407 public void onSuccess(CampaignList result) {
1405 - mNewCampaignList.addAll(result); 1408 + ArrayList<Campaign> tempCamps = new ArrayList<Campaign>(result);
1409 + mNewCampaignList.addAll(tempCamps);
1406 Collections.sort(mNewCampaignList, (obj1, obj2) -> Integer.compare(obj1.getSorting(), obj2.getSorting())); 1410 Collections.sort(mNewCampaignList, (obj1, obj2) -> Integer.compare(obj1.getSorting(), obj2.getSorting()));
1407 CampaignList campaignLoyaltyList = new CampaignList(); 1411 CampaignList campaignLoyaltyList = new CampaignList();
1408 campaignLoyaltyList.clear(); 1412 campaignLoyaltyList.clear();
...@@ -2023,7 +2027,11 @@ public class WarplyManager { ...@@ -2023,7 +2027,11 @@ public class WarplyManager {
2023 // } 2027 // }
2024 // WarplyManagerHelper.setCCMSLoyaltyCampaigns(list); 2028 // WarplyManagerHelper.setCCMSLoyaltyCampaigns(list);
2025 2029
2026 - receiver.onSuccess(campaignLoyaltyList); //result 2030 + CampaignList tempAllCamps = new CampaignList();
2031 + Set<Campaign> set = new LinkedHashSet<>(campaignLoyaltyList);
2032 + tempAllCamps.clear();
2033 + tempAllCamps.addAll(set);
2034 + receiver.onSuccess(tempAllCamps); //result, //campaignLoyaltyList
2027 } 2035 }
2028 2036
2029 @Override 2037 @Override
......