open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
ef70b248 1 parent ac336c17

new campaign keys

Inline Side-by-side
Showing 6 changed files with 52 additions and 5 deletions
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 # The app uuid the warply sdk need to connect to the engage server 3 # The app uuid the warply sdk need to connect to the engage server
4 # dev f83dfde1145e4c2da69793abb2f579af 4 # dev f83dfde1145e4c2da69793abb2f579af
5 # prod 0086a2088301440792091b9f814c2267 5 # prod 0086a2088301440792091b9f814c2267
6 -Uuid=0086a2088301440792091b9f814c2267 6 +Uuid=f83dfde1145e4c2da69793abb2f579af
7 7
8 # If we need to see logs in Logcat 8 # If we need to see logs in Logcat
9 Debug=true 9 Debug=true
...@@ -11,7 +11,7 @@ Debug=true ...@@ -11,7 +11,7 @@ Debug=true
11 # Production or Development environment of the engage server 11 # Production or Development environment of the engage server
12 # Production: https://engage.warp.ly 12 # Production: https://engage.warp.ly
13 # Development: https://engage-stage.warp.ly 13 # Development: https://engage-stage.warp.ly
14 -BaseURL=https://engage.warp.ly 14 +BaseURL=https://engage-stage.warp.ly
15 15
16 # For Verify Ticket request 16 # For Verify Ticket request
17 VerifyURL=/partners/cosmote/verify 17 VerifyURL=/partners/cosmote/verify
......
...@@ -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("6010490808"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons, prod 6006552990, prod 6005892749, live 3000184910 39 + .setGuid("7000000831"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons, prod 6006552990, prod 6005892749, live 3000184910
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.6rc45' 5 + PUBLISH_VERSION = '4.5.4.6rc46'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
......
...@@ -67,6 +67,8 @@ public class NewCampaignsHook implements CallbackReceiver<JSONObject> { ...@@ -67,6 +67,8 @@ public class NewCampaignsHook implements CallbackReceiver<JSONObject> {
67 camp.setSorting(newCamp.getSorting()); 67 camp.setSorting(newCamp.getSorting());
68 camp.setNew(newCamp.getIsNew()); 68 camp.setNew(newCamp.getIsNew());
69 camp.setType(newCamp.getCampaignType()); 69 camp.setType(newCamp.getCampaignType());
70 + camp.setBannerImage(newCamp.getBannerImage());
71 + camp.setBannerTitle(newCamp.getBannerTitle());
70 try { 72 try {
71 camp.setExtraFields(newCamp.getExtraFields().toString()); 73 camp.setExtraFields(newCamp.getExtraFields().toString());
72 } catch (NullPointerException e) { 74 } catch (NullPointerException e) {
......
...@@ -70,6 +70,8 @@ public class Campaign implements Parcelable, Serializable { ...@@ -70,6 +70,8 @@ public class Campaign implements Parcelable, Serializable {
70 private static final String ACTIONS = "actions"; 70 private static final String ACTIONS = "actions";
71 private static final String BUS_ID = "busId"; 71 private static final String BUS_ID = "busId";
72 private static final String CAMPAIGN_TYPE_SETTINGS = "campaign_type_settings"; 72 private static final String CAMPAIGN_TYPE_SETTINGS = "campaign_type_settings";
73 + private static final String BANNER_IMAGE = "Banner_img";
74 + private static final String BANNER_TITLE = "Banner_title";
73 75
74 /* Member variables of the Campaign object */ 76 /* Member variables of the Campaign object */
75 77
...@@ -97,6 +99,8 @@ public class Campaign implements Parcelable, Serializable { ...@@ -97,6 +99,8 @@ public class Campaign implements Parcelable, Serializable {
97 private String busId; 99 private String busId;
98 private ArrayList<CampaignAction> actions = new ArrayList<>(); 100 private ArrayList<CampaignAction> actions = new ArrayList<>();
99 private String campaignTypeSettings; 101 private String campaignTypeSettings;
102 + private String bannerImage;
103 + private String bannerTitle;
100 104
101 /** 105 /**
102 * Basic constructor used to create an object from a String, representing a 106 * Basic constructor used to create an object from a String, representing a
...@@ -134,6 +138,8 @@ public class Campaign implements Parcelable, Serializable { ...@@ -134,6 +138,8 @@ public class Campaign implements Parcelable, Serializable {
134 this.busId = ""; 138 this.busId = "";
135 this.actions = new ArrayList<>(); 139 this.actions = new ArrayList<>();
136 this.campaignTypeSettings = ""; 140 this.campaignTypeSettings = "";
141 + this.bannerImage = "";
142 + this.bannerTitle = "";
137 } 143 }
138 144
139 /** 145 /**
...@@ -590,6 +596,22 @@ public class Campaign implements Parcelable, Serializable { ...@@ -590,6 +596,22 @@ public class Campaign implements Parcelable, Serializable {
590 this.campaignTypeSettings = campaignTypeSettings; 596 this.campaignTypeSettings = campaignTypeSettings;
591 } 597 }
592 598
599 + public String getBannerImage() {
600 + return this.bannerImage;
601 + }
602 +
603 + public String getBannerTitle() {
604 + return this.bannerTitle;
605 + }
606 +
607 + public void setBannerImage(String bannerImage) {
608 + this.bannerImage = bannerImage;
609 + }
610 +
611 + public void setBannerTitle(String bannerTitle) {
612 + this.bannerTitle = bannerTitle;
613 + }
614 +
593 @Override 615 @Override
594 public int describeContents() { 616 public int describeContents() {
595 return 0; 617 return 0;
......
...@@ -66,6 +66,8 @@ public class NewCampaign implements Parcelable, Serializable { ...@@ -66,6 +66,8 @@ public class NewCampaign implements Parcelable, Serializable {
66 private static final String SETTINGS = "settings"; 66 private static final String SETTINGS = "settings";
67 private static final String AUDIENCE = "audience"; 67 private static final String AUDIENCE = "audience";
68 private static final String IS_NEW = "is_new"; 68 private static final String IS_NEW = "is_new";
69 + private static final String BANNER_IMAGE = "Banner_img";
70 + private static final String BANNER_TITLE = "Banner_title";
69 71
70 /* Member variables of the Campaign object */ 72 /* Member variables of the Campaign object */
71 private final String campaignType; 73 private final String campaignType;
...@@ -89,6 +91,8 @@ public class NewCampaign implements Parcelable, Serializable { ...@@ -89,6 +91,8 @@ public class NewCampaign implements Parcelable, Serializable {
89 private final String communicationName; 91 private final String communicationName;
90 private final String communicationCategory; 92 private final String communicationCategory;
91 private boolean isNew = false; 93 private boolean isNew = false;
94 + private String bannerImage = "";
95 + private String bannerTitle = "";
92 96
93 /** 97 /**
94 * Basic constructor used to create an object from a String, representing a 98 * Basic constructor used to create an object from a String, representing a
...@@ -128,7 +132,14 @@ public class NewCampaign implements Parcelable, Serializable { ...@@ -128,7 +132,14 @@ public class NewCampaign implements Parcelable, Serializable {
128 this.communicationName = json.optString(COMMUNICATION_NAME); 132 this.communicationName = json.optString(COMMUNICATION_NAME);
129 this.communicationCategory = json.optString(COMMUNICATION_CATEGORY); 133 this.communicationCategory = json.optString(COMMUNICATION_CATEGORY);
130 this.isNew = json.optBoolean(IS_NEW); 134 this.isNew = json.optBoolean(IS_NEW);
131 - 135 + if (this.extraFields != null) {
136 + if (this.extraFields.has(BANNER_IMAGE)) {
137 + this.bannerImage = this.extraFields.optString(BANNER_IMAGE);
138 + }
139 + if (this.extraFields.has(BANNER_TITLE)) {
140 + this.bannerTitle = this.extraFields.optString(BANNER_TITLE);
141 + }
142 + }
132 } 143 }
133 144
134 public NewCampaign(Parcel source) { 145 public NewCampaign(Parcel source) {
...@@ -153,6 +164,8 @@ public class NewCampaign implements Parcelable, Serializable { ...@@ -153,6 +164,8 @@ public class NewCampaign implements Parcelable, Serializable {
153 this.communicationCategory = source.readString(); 164 this.communicationCategory = source.readString();
154 this.category = source.readString(); 165 this.category = source.readString();
155 this.campaignType = source.readString(); 166 this.campaignType = source.readString();
167 + this.bannerImage = source.readString();
168 + this.bannerTitle = source.readString();
156 } 169 }
157 170
158 @Override 171 @Override
...@@ -178,6 +191,8 @@ public class NewCampaign implements Parcelable, Serializable { ...@@ -178,6 +191,8 @@ public class NewCampaign implements Parcelable, Serializable {
178 dest.writeString(this.category); 191 dest.writeString(this.category);
179 dest.writeString(this.campaignType); 192 dest.writeString(this.campaignType);
180 dest.writeString(this.communicationUUID); 193 dest.writeString(this.communicationUUID);
194 + dest.writeString(this.bannerImage);
195 + dest.writeString(this.bannerTitle);
181 } 196 }
182 197
183 /** 198 /**
...@@ -355,6 +370,14 @@ public class NewCampaign implements Parcelable, Serializable { ...@@ -355,6 +370,14 @@ public class NewCampaign implements Parcelable, Serializable {
355 return workflowSettings; 370 return workflowSettings;
356 } 371 }
357 372
373 + public String getBannerImage() {
374 + return bannerImage;
375 + }
376 +
377 + public String getBannerTitle() {
378 + return bannerTitle;
379 + }
380 +
358 @Override 381 @Override
359 public int describeContents() { 382 public int describeContents() {
360 return 0; 383 return 0;
......