open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
4c1706a1 1 parent 5a748879

ui fixes and changes

Inline Side-by-side
Showing 24 changed files with 119 additions and 71 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("7000000832"), //6012049321, 6012049322, 6012049323 39 + .setGuid("7000001407"), //6012049321, 6012049322, 6012049323
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-cosbeta52' 5 + PUBLISH_VERSION = '4.5.4-cosbeta54'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
...@@ -32,7 +32,7 @@ android { ...@@ -32,7 +32,7 @@ android {
32 32
33 buildTypes { 33 buildTypes {
34 release { 34 release {
35 - minifyEnabled false 35 + minifyEnabled true
36 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' 36 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
37 } 37 }
38 } 38 }
......
...@@ -27,5 +27,6 @@ ...@@ -27,5 +27,6 @@
27 -keep class com.huawei.hianalytics.**{*;} 27 -keep class com.huawei.hianalytics.**{*;}
28 -keep class com.huawei.updatesdk.**{*;} 28 -keep class com.huawei.updatesdk.**{*;}
29 -keep class com.huawei.hms.**{*;} 29 -keep class com.huawei.hms.**{*;}
30 +-keep class ly.warp.sdk.**{*;}
30 -keep,includedescriptorclasses class net.sqlcipher.** { *; } 31 -keep,includedescriptorclasses class net.sqlcipher.** { *; }
31 -keep,includedescriptorclasses interface net.sqlcipher.** { *; } 32 -keep,includedescriptorclasses interface net.sqlcipher.** { *; }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -22,7 +22,6 @@ import org.json.JSONObject; ...@@ -22,7 +22,6 @@ import org.json.JSONObject;
22 22
23 import io.github.inflationx.viewpump.ViewPumpContextWrapper; 23 import io.github.inflationx.viewpump.ViewPumpContextWrapper;
24 import ly.warp.sdk.R; 24 import ly.warp.sdk.R;
25 -import ly.warp.sdk.Warply;
26 import ly.warp.sdk.io.callbacks.CallbackReceiver; 25 import ly.warp.sdk.io.callbacks.CallbackReceiver;
27 import ly.warp.sdk.io.models.Campaign; 26 import ly.warp.sdk.io.models.Campaign;
28 import ly.warp.sdk.io.models.CampaignList; 27 import ly.warp.sdk.io.models.CampaignList;
...@@ -34,8 +33,7 @@ import ly.warp.sdk.io.request.WarplyGetCampaignsRequest; ...@@ -34,8 +33,7 @@ import ly.warp.sdk.io.request.WarplyGetCampaignsRequest;
34 import ly.warp.sdk.io.request.WarplyRedeemCouponRequest; 33 import ly.warp.sdk.io.request.WarplyRedeemCouponRequest;
35 import ly.warp.sdk.io.request.WarplyUserCouponsRequest; 34 import ly.warp.sdk.io.request.WarplyUserCouponsRequest;
36 import ly.warp.sdk.services.EventCampaignService; 35 import ly.warp.sdk.services.EventCampaignService;
37 -import ly.warp.sdk.services.EventService; 36 +import ly.warp.sdk.utils.WarpUtils;
38 -import ly.warp.sdk.utils.WarpJSONParser;
39 import ly.warp.sdk.utils.WarplyManagerHelper; 37 import ly.warp.sdk.utils.WarplyManagerHelper;
40 import ly.warp.sdk.utils.managers.WarplyManager; 38 import ly.warp.sdk.utils.managers.WarplyManager;
41 39
...@@ -158,13 +156,8 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe ...@@ -158,13 +156,8 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
158 // =========================================================== 156 // ===========================================================
159 157
160 private void initViews() { 158 private void initViews() {
161 - if (WarplyManagerHelper.getConsumerInternal() != null) { 159 + if (WarpUtils.getUserNonTelco(this)) {
162 - JSONObject profMetadata = WarpJSONParser.getJSONFromString(WarplyManagerHelper.getConsumerInternal().getProfileMetadata()); 160 + nonTelcoDialog();
163 - if (profMetadata != null) {
164 - if (profMetadata.has("nonTelco") && profMetadata.optBoolean("nonTelco")) {
165 - nonTelcoDialog();
166 - }
167 - }
168 } 161 }
169 162
170 mTvCouponsetTitle.setText(mCouponset.getName()); 163 mTvCouponsetTitle.setText(mCouponset.getName());
......
...@@ -11,7 +11,6 @@ import android.view.View; ...@@ -11,7 +11,6 @@ import android.view.View;
11 import android.widget.ImageView; 11 import android.widget.ImageView;
12 import android.widget.LinearLayout; 12 import android.widget.LinearLayout;
13 import android.widget.TextView; 13 import android.widget.TextView;
14 -import android.widget.Toast;
15 14
16 import androidx.appcompat.app.AlertDialog; 15 import androidx.appcompat.app.AlertDialog;
17 import androidx.constraintlayout.widget.ConstraintLayout; 16 import androidx.constraintlayout.widget.ConstraintLayout;
...@@ -22,7 +21,6 @@ import com.bumptech.glide.Glide; ...@@ -22,7 +21,6 @@ import com.bumptech.glide.Glide;
22 import com.bumptech.glide.load.engine.DiskCacheStrategy; 21 import com.bumptech.glide.load.engine.DiskCacheStrategy;
23 22
24 import org.greenrobot.eventbus.EventBus; 23 import org.greenrobot.eventbus.EventBus;
25 -import org.json.JSONObject;
26 24
27 import java.io.Serializable; 25 import java.io.Serializable;
28 import java.text.ParseException; 26 import java.text.ParseException;
...@@ -39,7 +37,6 @@ import ly.warp.sdk.R; ...@@ -39,7 +37,6 @@ import ly.warp.sdk.R;
39 import ly.warp.sdk.io.models.ActiveDFYCouponEventModel; 37 import ly.warp.sdk.io.models.ActiveDFYCouponEventModel;
40 import ly.warp.sdk.io.models.ActiveDFYCouponModel; 38 import ly.warp.sdk.io.models.ActiveDFYCouponModel;
41 import ly.warp.sdk.io.models.WarplyDealsAnalysisEventModel; 39 import ly.warp.sdk.io.models.WarplyDealsAnalysisEventModel;
42 -import ly.warp.sdk.utils.WarpJSONParser;
43 import ly.warp.sdk.utils.WarpUtils; 40 import ly.warp.sdk.utils.WarpUtils;
44 import ly.warp.sdk.utils.WarplyManagerHelper; 41 import ly.warp.sdk.utils.WarplyManagerHelper;
45 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 42 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
...@@ -136,10 +133,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener { ...@@ -136,10 +133,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
136 return; 133 return;
137 } 134 }
138 if (view.getId() == R.id.cl_deals_cos) { 135 if (view.getId() == R.id.cl_deals_cos) {
139 - //TODO: remove
140 WarpUtils.log("DFY coupon banner pressed!"); 136 WarpUtils.log("DFY coupon banner pressed!");
141 - Toast.makeText(this, "TODO:Remove:DFY banner clicked", Toast.LENGTH_SHORT).show();
142 - //TODO: remove
143 WarplyDealsAnalysisEventModel warplyDealsAnalysisEventModel = new WarplyDealsAnalysisEventModel(); 137 WarplyDealsAnalysisEventModel warplyDealsAnalysisEventModel = new WarplyDealsAnalysisEventModel();
144 warplyDealsAnalysisEventModel.setPressed(true); 138 warplyDealsAnalysisEventModel.setPressed(true);
145 EventBus.getDefault().post(new WarplyEventBusManager(warplyDealsAnalysisEventModel)); 139 EventBus.getDefault().post(new WarplyEventBusManager(warplyDealsAnalysisEventModel));
...@@ -183,13 +177,8 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener { ...@@ -183,13 +177,8 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
183 // =========================================================== 177 // ===========================================================
184 178
185 private void initViews() { 179 private void initViews() {
186 - if (WarplyManagerHelper.getConsumerInternal() != null) { 180 + if (WarpUtils.getUserNonTelco(this)) {
187 - JSONObject profMetadata = WarpJSONParser.getJSONFromString(WarplyManagerHelper.getConsumerInternal().getProfileMetadata()); 181 + nonTelcoDialog();
188 - if (profMetadata != null) {
189 - if (profMetadata.has("nonTelco") && profMetadata.optBoolean("nonTelco")) {
190 - nonTelcoDialog();
191 - }
192 - }
193 } 182 }
194 183
195 if (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() > 0) { 184 if (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() > 0) {
......
...@@ -6,11 +6,15 @@ import androidx.annotation.NonNull; ...@@ -6,11 +6,15 @@ import androidx.annotation.NonNull;
6 import androidx.work.Worker; 6 import androidx.work.Worker;
7 import androidx.work.WorkerParameters; 7 import androidx.work.WorkerParameters;
8 8
9 +import org.json.JSONObject;
10 +
11 +import ly.warp.sdk.Warply;
9 import ly.warp.sdk.io.callbacks.CallbackReceiver; 12 import ly.warp.sdk.io.callbacks.CallbackReceiver;
10 import ly.warp.sdk.io.models.CampaignList; 13 import ly.warp.sdk.io.models.CampaignList;
11 import ly.warp.sdk.io.models.Consumer; 14 import ly.warp.sdk.io.models.Consumer;
12 import ly.warp.sdk.io.request.WarplyConsumerRequest; 15 import ly.warp.sdk.io.request.WarplyConsumerRequest;
13 import ly.warp.sdk.io.request.WarplyGetCampaignsRequest; 16 import ly.warp.sdk.io.request.WarplyGetCampaignsRequest;
17 +import ly.warp.sdk.utils.WarpJSONParser;
14 import ly.warp.sdk.utils.WarpUtils; 18 import ly.warp.sdk.utils.WarpUtils;
15 import ly.warp.sdk.utils.WarplyManagerHelper; 19 import ly.warp.sdk.utils.WarplyManagerHelper;
16 import ly.warp.sdk.utils.managers.WarplyManager; 20 import ly.warp.sdk.utils.managers.WarplyManager;
...@@ -32,6 +36,15 @@ public class EventQuestionnaireService extends Worker { ...@@ -32,6 +36,15 @@ public class EventQuestionnaireService extends Worker {
32 public void onSuccess(Consumer result) { 36 public void onSuccess(Consumer result) {
33 WarplyManagerHelper.setConsumerInternal(result); 37 WarplyManagerHelper.setConsumerInternal(result);
34 38
39 + if (result != null) {
40 + JSONObject profMetadata = WarpJSONParser.getJSONFromString(result.getProfileMetadata());
41 + if (profMetadata != null) {
42 + if (profMetadata.has("nonTelco") && profMetadata.optBoolean("nonTelco")) {
43 + WarpUtils.setUserNonTelco(Warply.getWarplyContext(), profMetadata.optBoolean("nonTelco"));
44 + }
45 + }
46 + }
47 +
35 WarplyManager.getCampaigns(new WarplyGetCampaignsRequest().setLanguage("en"), new CallbackReceiver<CampaignList>() { 48 WarplyManager.getCampaigns(new WarplyGetCampaignsRequest().setLanguage("en"), new CallbackReceiver<CampaignList>() {
36 @Override 49 @Override
37 public void onSuccess(CampaignList result) { 50 public void onSuccess(CampaignList result) {
......
...@@ -114,7 +114,7 @@ public class WarplyHealthService extends Service implements SensorEventListener ...@@ -114,7 +114,7 @@ public class WarplyHealthService extends Service implements SensorEventListener
114 while (true) { 114 while (true) {
115 sendSteps(); 115 sendSteps();
116 try { 116 try {
117 - Thread.sleep(900000); 117 + Thread.sleep(10000); //900000
118 } catch (InterruptedException e) { 118 } catch (InterruptedException e) {
119 e.printStackTrace(); 119 e.printStackTrace();
120 } 120 }
...@@ -247,23 +247,25 @@ public class WarplyHealthService extends Service implements SensorEventListener ...@@ -247,23 +247,25 @@ public class WarplyHealthService extends Service implements SensorEventListener
247 private void sendSteps() { 247 private void sendSteps() {
248 String date = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss", Locale.getDefault()).format(new Date()); 248 String date = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss", Locale.getDefault()).format(new Date());
249 249
250 - WarplyManager.setPacingDetails(new PacingCalculateRequest() 250 + if (WarpUtils.getStepsCounter(this) > 0) {
251 - .setCounter(WarpUtils.getStepsCounter(this)) 251 + WarplyManager.setPacingDetails(new PacingCalculateRequest()
252 - .setDate(date), 252 + .setCounter(WarpUtils.getStepsCounter(this))
253 - new CallbackReceiver<JSONObject>() { 253 + .setDate(date),
254 - @Override 254 + new CallbackReceiver<JSONObject>() {
255 - public void onSuccess(JSONObject result) { 255 + @Override
256 - int status = result.optInt("status", 2); 256 + public void onSuccess(JSONObject result) {
257 - if (status == 1) { 257 + int status = result.optInt("status", 2);
258 - mSteps = 0; 258 + if (status == 1) {
259 - WarpUtils.setStepsCounter(WarplyHealthService.this, 0); 259 + mSteps = 0;
260 + WarpUtils.setStepsCounter(WarplyHealthService.this, 0);
261 + }
260 } 262 }
261 - }
262 263
263 - @Override 264 + @Override
264 - public void onFailure(int errorCode) { 265 + public void onFailure(int errorCode) {
265 - WarpUtils.log("Warply Health Service error: " + String.valueOf(errorCode)); 266 + WarpUtils.log("Warply Health Service error: " + String.valueOf(errorCode));
266 - } 267 + }
267 - }); 268 + });
269 + }
268 } 270 }
269 } 271 }
......
...@@ -137,6 +137,8 @@ public class WarpUtils { ...@@ -137,6 +137,8 @@ public class WarpUtils {
137 + "webview_params"; 137 + "webview_params";
138 private static final String PREFERENCES_STEPS_COUNTER = PREFERENCES_PREFIX 138 private static final String PREFERENCES_STEPS_COUNTER = PREFERENCES_PREFIX
139 + "steps_counter"; 139 + "steps_counter";
140 + private static final String PREFERENCES_KEY_USER_NON_TELCO = PREFERENCES_PREFIX
141 + + "user_non_telco";
140 142
141 private static SharedPreferences _prefs; 143 private static SharedPreferences _prefs;
142 144
...@@ -152,6 +154,16 @@ public class WarpUtils { ...@@ -152,6 +154,16 @@ public class WarpUtils {
152 editor.apply(); 154 editor.apply();
153 } 155 }
154 156
157 + public static boolean getUserNonTelco(Context context) {
158 + return getPreferences(context).getBoolean(PREFERENCES_KEY_USER_NON_TELCO, false);
159 + }
160 +
161 + public static void setUserNonTelco(Context context, boolean userNonTelco) {
162 + SharedPreferences.Editor editor = getPreferences(context).edit();
163 + editor.putBoolean(PREFERENCES_KEY_USER_NON_TELCO, userNonTelco);
164 + editor.apply();
165 + }
166 +
155 /** 167 /**
156 * Method used to return the token of this device for the GCM service 168 * Method used to return the token of this device for the GCM service
157 * 169 *
......
...@@ -726,7 +726,8 @@ public class WarplyManagerHelper { ...@@ -726,7 +726,8 @@ public class WarplyManagerHelper {
726 * Save the LoyaltyGiftsForYouPackage list 726 * Save the LoyaltyGiftsForYouPackage list
727 */ 727 */
728 public static void setSeasonalList(ArrayList<LoyaltyGiftsForYouPackage> seasonalCoupons) { 728 public static void setSeasonalList(ArrayList<LoyaltyGiftsForYouPackage> seasonalCoupons) {
729 - mSeasonalList = seasonalCoupons; 729 + mSeasonalList.clear();
730 + mSeasonalList.addAll(seasonalCoupons);
730 } 731 }
731 732
732 /** 733 /**
......
...@@ -25,10 +25,13 @@ ...@@ -25,10 +25,13 @@
25 25
26 package ly.warp.sdk.utils.managers; 26 package ly.warp.sdk.utils.managers;
27 27
28 +import android.content.Context;
28 import android.os.Handler; 29 import android.os.Handler;
29 import android.os.Looper; 30 import android.os.Looper;
30 import android.util.Log; 31 import android.util.Log;
31 32
33 +import androidx.appcompat.app.AlertDialog;
34 +
32 import org.json.JSONArray; 35 import org.json.JSONArray;
33 import org.json.JSONException; 36 import org.json.JSONException;
34 import org.json.JSONObject; 37 import org.json.JSONObject;
...@@ -37,6 +40,7 @@ import java.util.ArrayList; ...@@ -37,6 +40,7 @@ import java.util.ArrayList;
37 import java.util.Collections; 40 import java.util.Collections;
38 import java.util.Comparator; 41 import java.util.Comparator;
39 42
43 +import ly.warp.sdk.R;
40 import ly.warp.sdk.Warply; 44 import ly.warp.sdk.Warply;
41 import ly.warp.sdk.db.WarplyDBHelper; 45 import ly.warp.sdk.db.WarplyDBHelper;
42 import ly.warp.sdk.io.callbacks.AddressHook; 46 import ly.warp.sdk.io.callbacks.AddressHook;
...@@ -517,6 +521,8 @@ public class WarplyManager { ...@@ -517,6 +521,8 @@ public class WarplyManager {
517 WarpUtils.log("[WARP Trace] WARPLY Logout is active"); 521 WarpUtils.log("[WARP Trace] WARPLY Logout is active");
518 WarpUtils.log("**************************************************"); 522 WarpUtils.log("**************************************************");
519 523
524 + WarpUtils.setUserNonTelco(Warply.getWarplyContext(), false);
525 +
520 WarplyDBHelper.getInstance(Warply.getWarplyContext()).deleteAuth(); 526 WarplyDBHelper.getInstance(Warply.getWarplyContext()).deleteAuth();
521 WarplyDBHelper.getInstance(Warply.getWarplyContext()).deleteClient(); 527 WarplyDBHelper.getInstance(Warply.getWarplyContext()).deleteClient();
522 528
...@@ -803,6 +809,16 @@ public class WarplyManager { ...@@ -803,6 +809,16 @@ public class WarplyManager {
803 @Override 809 @Override
804 public void onSuccess(Consumer result) { 810 public void onSuccess(Consumer result) {
805 WarplyManagerHelper.setConsumerInternal(result); 811 WarplyManagerHelper.setConsumerInternal(result);
812 +
813 + if (result != null) {
814 + JSONObject profMetadata = WarpJSONParser.getJSONFromString(result.getProfileMetadata());
815 + if (profMetadata != null) {
816 + if (profMetadata.has("nonTelco") && profMetadata.optBoolean("nonTelco")) {
817 + WarpUtils.setUserNonTelco(Warply.getWarplyContext(), profMetadata.optBoolean("nonTelco"));
818 + }
819 + }
820 + }
821 +
806 if (result != null) { 822 if (result != null) {
807 JSONObject profMetadata = WarpJSONParser.getJSONFromString(result.getProfileMetadata()); 823 JSONObject profMetadata = WarpJSONParser.getJSONFromString(result.getProfileMetadata());
808 if (profMetadata != null) { 824 if (profMetadata != null) {
...@@ -2094,7 +2110,7 @@ public class WarplyManager { ...@@ -2094,7 +2110,7 @@ public class WarplyManager {
2094 }); 2110 });
2095 } 2111 }
2096 2112
2097 - public static void getPacingDetails(PacingDetailsRequest request, final CallbackReceiver<PacingDetails> receiver) { 2113 + public static void getPacingDetails(Context context, PacingDetailsRequest request, final CallbackReceiver<PacingDetails> receiver) {
2098 WarpUtils.log("************* WARPLY Pacing Details Request ********************"); 2114 WarpUtils.log("************* WARPLY Pacing Details Request ********************");
2099 WarpUtils.log("[WARP Trace] WARPLY Pacing Details Request is active"); 2115 WarpUtils.log("[WARP Trace] WARPLY Pacing Details Request is active");
2100 WarpUtils.log("**************************************************"); 2116 WarpUtils.log("**************************************************");
...@@ -2102,6 +2118,16 @@ public class WarplyManager { ...@@ -2102,6 +2118,16 @@ public class WarplyManager {
2102 Warply.postReceiveMicroappData(true, "context", request.toJson(), new PacingDetailsHook(new CallbackReceiver<PacingDetails>() { 2118 Warply.postReceiveMicroappData(true, "context", request.toJson(), new PacingDetailsHook(new CallbackReceiver<PacingDetails>() {
2103 @Override 2119 @Override
2104 public void onSuccess(PacingDetails result) { 2120 public void onSuccess(PacingDetails result) {
2121 + if (result.getMeters().getMonth().getValue() >= result.getMeters().getMonth().getGoal()) {
2122 + new AlertDialog.Builder(context)
2123 + .setTitle(R.string.cos_dlg_success_title)
2124 + .setMessage(R.string.cos_dlg_pacing_goal)
2125 + .setPositiveButton(R.string.cos_dlg_positive_button2, (dialogPositive, whichPositive) -> {
2126 + dialogPositive.dismiss();
2127 + })
2128 + .show();
2129 + }
2130 +
2105 receiver.onSuccess(result); 2131 receiver.onSuccess(result);
2106 } 2132 }
2107 2133
...@@ -2113,7 +2139,7 @@ public class WarplyManager { ...@@ -2113,7 +2139,7 @@ public class WarplyManager {
2113 public void onSuccess(JSONObject result) { 2139 public void onSuccess(JSONObject result) {
2114 int status = result.optInt("status", 2); 2140 int status = result.optInt("status", 2);
2115 if (status == 1) 2141 if (status == 1)
2116 - getPacingDetails(request, receiver); 2142 + getPacingDetails(context, request, receiver);
2117 else 2143 else
2118 receiver.onFailure(status); 2144 receiver.onFailure(status);
2119 } 2145 }
...@@ -2287,6 +2313,16 @@ public class WarplyManager { ...@@ -2287,6 +2313,16 @@ public class WarplyManager {
2287 @Override 2313 @Override
2288 public void onSuccess(Consumer result) { 2314 public void onSuccess(Consumer result) {
2289 WarplyManagerHelper.setConsumerInternal(result); 2315 WarplyManagerHelper.setConsumerInternal(result);
2316 +
2317 + if (result != null) {
2318 + JSONObject profMetadata = WarpJSONParser.getJSONFromString(result.getProfileMetadata());
2319 + if (profMetadata != null) {
2320 + if (profMetadata.has("nonTelco") && profMetadata.optBoolean("nonTelco")) {
2321 + WarpUtils.setUserNonTelco(Warply.getWarplyContext(), profMetadata.optBoolean("nonTelco"));
2322 + }
2323 + }
2324 + }
2325 +
2290 if (result != null) { 2326 if (result != null) {
2291 JSONObject profMetadata = WarpJSONParser.getJSONFromString(result.getProfileMetadata()); 2327 JSONObject profMetadata = WarpJSONParser.getJSONFromString(result.getProfileMetadata());
2292 if (profMetadata != null) { 2328 if (profMetadata != null) {
......
...@@ -111,7 +111,7 @@ public class ExpiredCouponAdapter extends RecyclerView.Adapter<ExpiredCouponAdap ...@@ -111,7 +111,7 @@ public class ExpiredCouponAdapter extends RecyclerView.Adapter<ExpiredCouponAdap
111 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm"); 111 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
112 Date newDate = new Date(); 112 Date newDate = new Date();
113 try { 113 try {
114 - newDate = simpleDateFormat.parse(couponItem.getExpiration()); 114 + newDate = simpleDateFormat.parse(couponItem.getCreated());
115 } catch (ParseException e) { 115 } catch (ParseException e) {
116 e.printStackTrace(); 116 e.printStackTrace();
117 } 117 }
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
15 15
16 <ImageView 16 <ImageView
17 android:id="@+id/iv_coupons_close" 17 android:id="@+id/iv_coupons_close"
18 - android:layout_width="21dp" 18 + android:layout_width="26dp"
19 - android:layout_height="20dp" 19 + android:layout_height="25dp"
20 android:layout_marginStart="24dp" 20 android:layout_marginStart="24dp"
21 android:layout_marginTop="4dp" 21 android:layout_marginTop="4dp"
22 android:src="@drawable/ic_back" 22 android:src="@drawable/ic_back"
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
15 15
16 <ImageView 16 <ImageView
17 android:id="@+id/iv_list_close" 17 android:id="@+id/iv_list_close"
18 - android:layout_width="21dp" 18 + android:layout_width="26dp"
19 - android:layout_height="20dp" 19 + android:layout_height="25dp"
20 android:layout_marginStart="24dp" 20 android:layout_marginStart="24dp"
21 android:layout_marginTop="4dp" 21 android:layout_marginTop="4dp"
22 android:src="@drawable/ic_back" 22 android:src="@drawable/ic_back"
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_contextual_back" 15 android:id="@+id/iv_contextual_back"
16 - android:layout_width="20dp" 16 + android:layout_width="26dp"
17 - android:layout_height="20dp" 17 + android:layout_height="25dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 android:src="@drawable/ic_back" 19 android:src="@drawable/ic_back"
20 app:layout_constraintBottom_toBottomOf="parent" 20 app:layout_constraintBottom_toBottomOf="parent"
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_coupon_info_back" 15 android:id="@+id/iv_coupon_info_back"
16 - android:layout_width="20dp" 16 + android:layout_width="26dp"
17 - android:layout_height="20dp" 17 + android:layout_height="25dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 android:src="@drawable/ic_back" 19 android:src="@drawable/ic_back"
20 app:layout_constraintBottom_toBottomOf="parent" 20 app:layout_constraintBottom_toBottomOf="parent"
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_coupon_share_back" 15 android:id="@+id/iv_coupon_share_back"
16 - android:layout_width="20dp" 16 + android:layout_width="26dp"
17 - android:layout_height="20dp" 17 + android:layout_height="25dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 android:src="@drawable/ic_back" 19 android:src="@drawable/ic_back"
20 app:layout_constraintBottom_toBottomOf="parent" 20 app:layout_constraintBottom_toBottomOf="parent"
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_couponset_info_back" 15 android:id="@+id/iv_couponset_info_back"
16 - android:layout_width="20dp" 16 + android:layout_width="26dp"
17 - android:layout_height="20dp" 17 + android:layout_height="25dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 android:src="@drawable/ic_back" 19 android:src="@drawable/ic_back"
20 app:layout_constraintBottom_toBottomOf="parent" 20 app:layout_constraintBottom_toBottomOf="parent"
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
16 16
17 <ImageView 17 <ImageView
18 android:id="@+id/iv_list_close" 18 android:id="@+id/iv_list_close"
19 - android:layout_width="21dp" 19 + android:layout_width="26dp"
20 - android:layout_height="20dp" 20 + android:layout_height="25dp"
21 android:layout_marginStart="24dp" 21 android:layout_marginStart="24dp"
22 android:layout_marginTop="4dp" 22 android:layout_marginTop="4dp"
23 android:src="@drawable/ic_back" 23 android:src="@drawable/ic_back"
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
15 15
16 <ImageView 16 <ImageView
17 android:id="@+id/iv_loyalty_analysis_close" 17 android:id="@+id/iv_loyalty_analysis_close"
18 - android:layout_width="20dp" 18 + android:layout_width="26dp"
19 - android:layout_height="20dp" 19 + android:layout_height="25dp"
20 android:layout_marginStart="16dp" 20 android:layout_marginStart="16dp"
21 android:src="@drawable/ic_back" 21 android:src="@drawable/ic_back"
22 app:layout_constraintBottom_toBottomOf="parent" 22 app:layout_constraintBottom_toBottomOf="parent"
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_back" 15 android:id="@+id/iv_back"
16 - android:layout_width="20dp" 16 + android:layout_width="26dp"
17 - android:layout_height="20dp" 17 + android:layout_height="25dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 android:src="@drawable/ic_back" 19 android:src="@drawable/ic_back"
20 app:layout_constraintBottom_toBottomOf="parent" 20 app:layout_constraintBottom_toBottomOf="parent"
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
15 15
16 <ImageView 16 <ImageView
17 android:id="@+id/iv_list_close" 17 android:id="@+id/iv_list_close"
18 - android:layout_width="21dp" 18 + android:layout_width="26dp"
19 - android:layout_height="20dp" 19 + android:layout_height="25dp"
20 android:layout_marginStart="24dp" 20 android:layout_marginStart="24dp"
21 android:layout_marginTop="4dp" 21 android:layout_marginTop="4dp"
22 android:src="@drawable/ic_back" 22 android:src="@drawable/ic_back"
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_shops_back" 15 android:id="@+id/iv_shops_back"
16 - android:layout_width="20dp" 16 + android:layout_width="26dp"
17 - android:layout_height="20dp" 17 + android:layout_height="25dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 android:src="@drawable/ic_back" 19 android:src="@drawable/ic_back"
20 app:layout_constraintBottom_toBottomOf="parent" 20 app:layout_constraintBottom_toBottomOf="parent"
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_telco_back" 15 android:id="@+id/iv_telco_back"
16 - android:layout_width="20dp" 16 + android:layout_width="22dp"
17 - android:layout_height="20dp" 17 + android:layout_height="22dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 android:src="@drawable/ic_close" 19 android:src="@drawable/ic_close"
20 app:layout_constraintBottom_toBottomOf="parent" 20 app:layout_constraintBottom_toBottomOf="parent"
......
...@@ -131,6 +131,7 @@ ...@@ -131,6 +131,7 @@
131 <string name="cos_directions">Οδηγίες</string> 131 <string name="cos_directions">Οδηγίες</string>
132 <string name="cos_empty_shared_coupons">Δεν έχεις μοιραστεί ακόμη κουπόνια</string> 132 <string name="cos_empty_shared_coupons">Δεν έχεις μοιραστεί ακόμη κουπόνια</string>
133 <string name="cos_empty_expired_coupons">Δεν έχεις εξαργυρώσει ακόμη κουπόνια</string> 133 <string name="cos_empty_expired_coupons">Δεν έχεις εξαργυρώσει ακόμη κουπόνια</string>
134 + <string name="cos_dlg_pacing_goal">Πέτυχες το στόχο του μήνα! Διάλεξε το δώρο που επιθυμείς να ενεργοποιήσεις!</string>
134 135
135 <string-array name="coupons_array"> 136 <string-array name="coupons_array">
136 <item>Κουπόνια</item> 137 <item>Κουπόνια</item>
......