open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
2a73199a 1 parent cb8bc160

new keys

Inline Side-by-side
Showing 3 changed files with 8 additions and 3 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-cosbeta96' 5 + PUBLISH_VERSION = '4.5.4-cosbeta97'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
......
...@@ -133,7 +133,6 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -133,7 +133,6 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
133 133
134 Intent intent = new Intent(CouponInfoActivity.this, ShopsActivity.class); 134 Intent intent = new Intent(CouponInfoActivity.this, ShopsActivity.class);
135 intent.putExtra("couponset", (Serializable) mCouponset); 135 intent.putExtra("couponset", (Serializable) mCouponset);
136 - intent.putExtra("merchant", (Serializable) mMerchant);
137 startActivity(intent); 136 startActivity(intent);
138 return; 137 return;
139 } 138 }
......
...@@ -44,6 +44,7 @@ import ly.warp.sdk.io.models.Couponset; ...@@ -44,6 +44,7 @@ import ly.warp.sdk.io.models.Couponset;
44 import ly.warp.sdk.io.models.Merchant; 44 import ly.warp.sdk.io.models.Merchant;
45 import ly.warp.sdk.io.models.MerchantList; 45 import ly.warp.sdk.io.models.MerchantList;
46 import ly.warp.sdk.io.request.WarplyMerchantsRequest; 46 import ly.warp.sdk.io.request.WarplyMerchantsRequest;
47 +import ly.warp.sdk.utils.WarplyManagerHelper;
47 import ly.warp.sdk.utils.constants.WarpConstants; 48 import ly.warp.sdk.utils.constants.WarpConstants;
48 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager; 49 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
49 import ly.warp.sdk.utils.managers.WarplyManager; 50 import ly.warp.sdk.utils.managers.WarplyManager;
...@@ -82,7 +83,12 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe ...@@ -82,7 +83,12 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
82 setContentView(R.layout.activity_shops); 83 setContentView(R.layout.activity_shops);
83 84
84 mCouponset = (Couponset) getIntent().getSerializableExtra("couponset"); 85 mCouponset = (Couponset) getIntent().getSerializableExtra("couponset");
85 - mMerchant = (Merchant) getIntent().getSerializableExtra("merchant"); 86 + for (Merchant merchant : WarplyManagerHelper.getMerchantList()) {
87 + if (merchant.getUuid().equals(mCouponset.getMerchantUuid())) {
88 + mMerchant = merchant;
89 + break;
90 + }
91 + }
86 92
87 mIvBack = findViewById(R.id.iv_shops_back); 93 mIvBack = findViewById(R.id.iv_shops_back);
88 mMapView = (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.mv_shops); 94 mMapView = (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.mv_shops);
......