Panagiotis Triantafyllou

minor fix

......@@ -653,7 +653,8 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
String tempCoupon = "";
int result = 0;
if (mCoupon.getCoupon().length() == 13) {
if (mCoupon != null) {
if (!TextUtils.isEmpty(mCoupon.getCoupon()) && mCoupon.getCoupon().length() == 13) {
tempCoupon = mCoupon.getCoupon();
try {
......@@ -663,7 +664,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
} catch (Exception e) {
e.printStackTrace();
}
} else {
} else if (!TextUtils.isEmpty(mCoupon.getCoupon()) && mCoupon.getCoupon().length() != 13) {
try {
tempCoupon = mCoupon.getCoupon();
for (int i = 0; i < (12 - mCoupon.getCoupon().length()); i++) {
......@@ -683,6 +684,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
e.printStackTrace();
}
}
}
createBarcodeBitmap(tempCoupon);
}
......
......@@ -160,7 +160,7 @@ public class Coupon implements Parcelable, Serializable {
if (json != null) {
this.barcode = json.optString(BARCODE);
this.category = json.optString(CATEGORY);
this.coupon = json.optString(COUPON);
this.coupon = json.optString(COUPON, "");
this.created = json.optString(CREATED);
this.description = json.optString(DESCRIPTION);
this.discount = json.optString(DISCOUNT);
......@@ -214,7 +214,7 @@ public class Coupon implements Parcelable, Serializable {
e.printStackTrace();
}
}
this.coupon = json.optString(COUPON);
this.coupon = json.optString(COUPON, "");
this.couponsetUuid = json.optString(COUPONSET_UUID);
this.discount = json.optString(DISCOUNT);
if (this.discount.contains(",")) {
......