feedback fixes

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 
 ext {
 ext {
     PUBLISH_GROUP_ID = 'ly.warp'
     PUBLISH_GROUP_ID = 'ly.warp'
-    PUBLISH_VERSION = '4.5.4.6rc71'
+    PUBLISH_VERSION = '4.5.4.6rc72'
     PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
     PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
 }
 }
 
 

@@ -90,12 +90,26 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
         if (WarplyManagerHelper.getMarketCoupons() != null && WarplyManagerHelper.getMarketCoupons().size() > 0) {
         if (WarplyManagerHelper.getMarketCoupons() != null && WarplyManagerHelper.getMarketCoupons().size() > 0) {
             final ExecutorService executor = Executors.newFixedThreadPool(1);
             final ExecutorService executor = Executors.newFixedThreadPool(1);
             executor.submit(() -> {
             executor.submit(() -> {
-                for (UnifiedCoupon unicoupon : WarplyManagerHelper.getMarketCoupons()) {
-                    if (unicoupon.getCoupons() != null && unicoupon.getCoupons().size() > 0) {
-                        for (Coupon inncoupon : unicoupon.getCoupons()) {
-                            if (inncoupon.getStatus() == 0) {
-                                countValue += Float.valueOf(inncoupon.getDiscount());
-                                mExpiredMarketCoupons.add(inncoupon);
+//                for (UnifiedCoupon unicoupon : WarplyManagerHelper.getMarketCoupons()) {
+//                    if (unicoupon.getCoupons() != null && unicoupon.getCoupons().size() > 0) {
+//                        for (Coupon inncoupon : unicoupon.getCoupons()) {
+//                            if (inncoupon.getStatus() == 0) {
+//                                countValue += Float.valueOf(inncoupon.getDiscount());
+//                                mExpiredMarketCoupons.add(inncoupon);
+//                            }
+//                        }
+//                    }
+//                }
+
+                if (WarplyManagerHelper.getCouponRedeemedList().size() > 0) {
+                    if (WarplyManagerHelper.getCouponsetsDeals().size() > 0) {
+                        for (Couponset couset : WarplyManagerHelper.getCouponsetsDeals()) {
+                            for (Coupon cou : WarplyManagerHelper.getCouponRedeemedList()) {
+                                if (cou.getCouponsetUuid().equals(couset.getUuid())) {
+                                    countValue += Float.valueOf(cou.getDiscount());
+                                    mExpiredMarketCoupons.add(cou);
+                                    break;
+                                }
                             }
                             }
                         }
                         }
                     }
                     }

@@ -529,7 +529,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
         }
         }
 
 
         // Third Expandable Banner
         // Third Expandable Banner
-        if (WarplyManagerHelper.getMarketCoupons().size() > 0) {
+        if (WarplyManagerHelper.getMarketCoupons() != null && WarplyManagerHelper.getMarketCoupons().size() > 0) {
             countValue = 0.0f;
             countValue = 0.0f;
 //            for (UnifiedCoupon unicou : WarplyManagerHelper.getMarketCoupons()) {
 //            for (UnifiedCoupon unicou : WarplyManagerHelper.getMarketCoupons()) {
 //                if (unicou.getCoupons() != null && unicou.getCoupons().size() > 0) {
 //                if (unicou.getCoupons() != null && unicou.getCoupons().size() > 0) {
@@ -547,6 +547,13 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
                         for (Coupon cou : WarplyManagerHelper.getCouponRedeemedList()) {
                         for (Coupon cou : WarplyManagerHelper.getCouponRedeemedList()) {
                             if (cou.getCouponsetUuid().equals(couset.getUuid())) {
                             if (cou.getCouponsetUuid().equals(couset.getUuid())) {
                                 countValue += Float.valueOf(cou.getDiscount());
                                 countValue += Float.valueOf(cou.getDiscount());
+                                cou.setDescription(couset.getShortDescription());
+                                cou.setImage(couset.getImgPreview());
+                                cou.setName(couset.getName());
+                                cou.setMerchantUuid(couset.getMerchantUuid());
+                                cou.setInnerText(couset.getInnerText());
+                                cou.setDiscount_type(couset.getDiscount_type());
+                                cou.setFinal_price(couset.getFinal_price());
                                 break;
                                 break;
                             }
                             }
                         }
                         }