Showing
4 changed files
with
45 additions
and
45 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-cosbeta32' | 5 | + PUBLISH_VERSION = '4.5.4-cosbeta33' |
6 | PUBLISH_ARTIFACT_ID = 'warply-android-sdk' | 6 | PUBLISH_ARTIFACT_ID = 'warply-android-sdk' |
7 | } | 7 | } |
8 | 8 | ... | ... |
This diff is collapsed. Click to expand it.
... | @@ -179,17 +179,17 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene | ... | @@ -179,17 +179,17 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene |
179 | try { | 179 | try { |
180 | JSONObject extraFields = WarpJSONParser.getJSONFromString(dataItem.getCampaign().getExtraFields()); | 180 | JSONObject extraFields = WarpJSONParser.getJSONFromString(dataItem.getCampaign().getExtraFields()); |
181 | if (extraFields != null) { | 181 | if (extraFields != null) { |
182 | - if (extraFields.has("type") && extraFields.optString("type").equals("telco")) { | 182 | +// if (extraFields.has("type") && extraFields.optString("type").equals("telco")) { |
183 | - for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { | 183 | +// for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { |
184 | - if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) { | 184 | +// if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) { |
185 | - Intent intent = new Intent(GiftsForYouActivity.this, TelcoActivity.class); | 185 | +// Intent intent = new Intent(GiftsForYouActivity.this, TelcoActivity.class); |
186 | - intent.putExtra("ccms", ccms); | 186 | +// intent.putExtra("ccms", ccms); |
187 | - startActivity(intent); | 187 | +// startActivity(intent); |
188 | - break; | 188 | +// break; |
189 | - } | 189 | +// } |
190 | - } | 190 | +// } |
191 | - return; | 191 | +// return; |
192 | - } | 192 | +// } |
193 | if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) { | 193 | if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) { |
194 | for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { | 194 | for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { |
195 | if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) { | 195 | if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) { |
... | @@ -271,17 +271,17 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene | ... | @@ -271,17 +271,17 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene |
271 | try { | 271 | try { |
272 | JSONObject extraFields = WarpJSONParser.getJSONFromString(dataItem.getCampaign().getExtraFields()); | 272 | JSONObject extraFields = WarpJSONParser.getJSONFromString(dataItem.getCampaign().getExtraFields()); |
273 | if (extraFields != null) { | 273 | if (extraFields != null) { |
274 | - if (extraFields.has("type") && extraFields.optString("type").equals("telco")) { | 274 | +// if (extraFields.has("type") && extraFields.optString("type").equals("telco")) { |
275 | - for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { | 275 | +// for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { |
276 | - if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) { | 276 | +// if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) { |
277 | - Intent intent = new Intent(GiftsForYouActivity.this, TelcoActivity.class); | 277 | +// Intent intent = new Intent(GiftsForYouActivity.this, TelcoActivity.class); |
278 | - intent.putExtra("ccms", ccms); | 278 | +// intent.putExtra("ccms", ccms); |
279 | - startActivity(intent); | 279 | +// startActivity(intent); |
280 | - break; | 280 | +// break; |
281 | - } | 281 | +// } |
282 | - } | 282 | +// } |
283 | - return; | 283 | +// return; |
284 | - } | 284 | +// } |
285 | if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) { | 285 | if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) { |
286 | for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { | 286 | for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { |
287 | if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) { | 287 | if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) { | ... | ... |
... | @@ -123,17 +123,17 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener | ... | @@ -123,17 +123,17 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener |
123 | try { | 123 | try { |
124 | JSONObject extraFields = WarpJSONParser.getJSONFromString(gift.getExtraFields()); | 124 | JSONObject extraFields = WarpJSONParser.getJSONFromString(gift.getExtraFields()); |
125 | if (extraFields != null) { | 125 | if (extraFields != null) { |
126 | - if (extraFields.has("type") && extraFields.optString("type").equals("telco")) { | 126 | +// if (extraFields.has("type") && extraFields.optString("type").equals("telco")) { |
127 | - for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { | 127 | +// for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { |
128 | - if (ccms.getLoyaltyCampaignId().equals(gift.getSessionUUID())) { | 128 | +// if (ccms.getLoyaltyCampaignId().equals(gift.getSessionUUID())) { |
129 | - Intent intent = new Intent(MoreForYouActivity.this, TelcoActivity.class); | 129 | +// Intent intent = new Intent(MoreForYouActivity.this, TelcoActivity.class); |
130 | - intent.putExtra("ccms", ccms); | 130 | +// intent.putExtra("ccms", ccms); |
131 | - startActivity(intent); | 131 | +// startActivity(intent); |
132 | - break; | 132 | +// break; |
133 | - } | 133 | +// } |
134 | - } | 134 | +// } |
135 | - return; | 135 | +// return; |
136 | - } | 136 | +// } |
137 | if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) { | 137 | if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) { |
138 | for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { | 138 | for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { |
139 | if (ccms.getLoyaltyCampaignId().equals(gift.getSessionUUID())) { | 139 | if (ccms.getLoyaltyCampaignId().equals(gift.getSessionUUID())) { |
... | @@ -184,17 +184,17 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener | ... | @@ -184,17 +184,17 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener |
184 | try { | 184 | try { |
185 | JSONObject extraFields = WarpJSONParser.getJSONFromString(gift.getExtraFields()); | 185 | JSONObject extraFields = WarpJSONParser.getJSONFromString(gift.getExtraFields()); |
186 | if (extraFields != null) { | 186 | if (extraFields != null) { |
187 | - if (extraFields.has("type") && extraFields.optString("type").equals("telco")) { | 187 | +// if (extraFields.has("type") && extraFields.optString("type").equals("telco")) { |
188 | - for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { | 188 | +// for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { |
189 | - if (ccms.getLoyaltyCampaignId().equals(gift.getSessionUUID())) { | 189 | +// if (ccms.getLoyaltyCampaignId().equals(gift.getSessionUUID())) { |
190 | - Intent intent = new Intent(MoreForYouActivity.this, TelcoActivity.class); | 190 | +// Intent intent = new Intent(MoreForYouActivity.this, TelcoActivity.class); |
191 | - intent.putExtra("ccms", ccms); | 191 | +// intent.putExtra("ccms", ccms); |
192 | - startActivity(intent); | 192 | +// startActivity(intent); |
193 | - break; | 193 | +// break; |
194 | - } | 194 | +// } |
195 | - } | 195 | +// } |
196 | - return; | 196 | +// return; |
197 | - } | 197 | +// } |
198 | if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) { | 198 | if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) { |
199 | for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { | 199 | for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { |
200 | if (ccms.getLoyaltyCampaignId().equals(gift.getSessionUUID())) { | 200 | if (ccms.getLoyaltyCampaignId().equals(gift.getSessionUUID())) { | ... | ... |
-
Please register or login to post a comment