crash fixes

Panagiotis Triantafyllou
Commit 8cbd78a158348f7377b2d7c0c02f3120d547497e 8cbd78a1 1 parent 4e9e131d
Showing 6 changed files with 47 additions and 18 deletions
warply_android_sdk/build.gradle
warply_android_sdk/src/main/java/ly/warp/sdk/activities/CouponInfoActivity.java
warply_android_sdk/src/main/java/ly/warp/sdk/activities/CouponsetInfoActivity.java
warply_android_sdk/src/main/java/ly/warp/sdk/fragments/MyRewardsFragment.java
warply_android_sdk/src/main/java/ly/warp/sdk/utils/managers/WarplyAnalyticsManager.java
warply_android_sdk/src/main/java/ly/warp/sdk/views/WarpView.java
--- a/warply_android_sdk/build.gradle
View file @8cbd78a
+++ b/warply_android_sdk/build.gradle
View file @8cbd78a
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 ext {
     PUBLISH_GROUP_ID = 'ly.warp'
-    PUBLISH_VERSION = '4.5.5.4r22'
+    PUBLISH_VERSION = '4.5.5.4r23'
     PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
 }
--- a/warply_android_sdk/src/main/java/ly/warp/sdk/activities/CouponInfoActivity.java
View file @8cbd78a
+++ b/warply_android_sdk/src/main/java/ly/warp/sdk/activities/CouponInfoActivity.java
View file @8cbd78a
@@ -155,10 +155,10 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
                 mGiftPressed = true;
                 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("ShareCoupon")
                         .concat(":")
-                        .concat(mCoupon.getName()));
+                        .concat(mCoupon != null ? mCoupon.getName() : ""));
                 Intent intent = new Intent(CouponInfoActivity.this, CouponShareActivity.class);
-                intent.putExtra("coupon", mCoupon.getCoupon());
+                intent.putExtra("coupon", mCoupon != null ? mCoupon.getCoupon() : "");
                 intent.putExtra("isFromWallet", mIsFromWallet);
                 if (!mIsFromWallet)
                     startActivity(intent);
@@ -174,12 +174,12 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
                 if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(CouponInfoActivity.this) == ConnectionResult.SUCCESS) {
                     Intent intent = new Intent(CouponInfoActivity.this, ShopsActivity.class);
-                    intent.putExtra("coupon", mCoupon.getCoupon());
+                    intent.putExtra("coupon", mCoupon != null ? mCoupon.getCoupon() : "");
                     startActivity(intent);
                     return;
                 } else {
                     Intent intent = new Intent(CouponInfoActivity.this, ShopsHuaweiActivity.class);
-                    intent.putExtra("coupon", mCoupon.getCoupon());
+                    intent.putExtra("coupon", mCoupon != null ? mCoupon.getCoupon() : "");
                     startActivity(intent);
                     return;
                 }
@@ -250,12 +250,14 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
         mLlBarcodeContainer.setVisibility(View.GONE);
         mIvBarcode.setVisibility(View.GONE);
+        if (mCoupon != null) {
             if (mIsUnified) {
                 mTvCouponTitle.setText(HtmlCompat.fromHtml(mCoupon.getName(), HtmlCompat.FROM_HTML_MODE_COMPACT));
             } else {
                 mTvCouponCode.setText(mCoupon.getCoupon());
                 mTvCouponTitle.setText(mCoupon.getCouponsetDetails().getName());
             }
+        }
         if (mCoupon != null) {
             if (mIsFromWallet) {
@@ -302,6 +304,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
         if (mIsUnified) {
             mIvCouponPhoto.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+            if (mCoupon != null) {
                 if (!TextUtils.isEmpty(mCoupon.getImage())) {
                     Glide.with(this)
 //                        .setDefaultRequestOptions(
@@ -317,8 +320,14 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
                             .into(mIvCouponPhoto);
                 }
             } else {
+                Glide.with(this)
+                        .load(R.drawable.ic_cosmote_logo_horizontal_grey)
+                        .into(mIvCouponPhoto);
+            }
+        } else {
             mIvCouponPhoto.setScaleType(ImageView.ScaleType.CENTER_CROP);
+            if (mCoupon != null) {
                 if (!TextUtils.isEmpty(mCoupon.getCouponsetDetails().getImgPreview())) {
                     Glide.with(this)
 //                        .setDefaultRequestOptions(
@@ -333,6 +342,11 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
                             .load(R.drawable.ic_cosmote_logo_horizontal_grey)
                             .into(mIvCouponPhoto);
                 }
+            } else {
+                Glide.with(this)
+                        .load(R.drawable.ic_cosmote_logo_horizontal_grey)
+                        .into(mIvCouponPhoto);
+            }
         }
         mIvBack.setOnClickListener(this);
--- a/warply_android_sdk/src/main/java/ly/warp/sdk/activities/CouponsetInfoActivity.java
View file @8cbd78a
+++ b/warply_android_sdk/src/main/java/ly/warp/sdk/activities/CouponsetInfoActivity.java
View file @8cbd78a
@@ -128,14 +128,14 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
                 mPbLoading.setVisibility(View.VISIBLE);
                 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("RetrieveCoupon")
                         .concat(":")
-                        .concat(mCouponset.getUuid()));
+                        .concat(mCouponset != null ? mCouponset.getUuid() : ""));
                 if (mCcms == null) {
                     WarplyManager.redeemCoupon(new WarplyRedeemCouponRequest()
-                            .setCouponsetUuid(mCouponset.getUuid())
+                            .setCouponsetUuid(mCouponset != null ? mCouponset.getUuid() : "")
                             .setCommunicationUuid(mLoyalty.getSessionUUID()), mRedeemCouponCallback);
                 } else {
                     WarplyManager.redeemCoupon(new WarplyRedeemCouponRequest()
-                            .setCouponsetUuid(mCouponset.getUuid())
+                            .setCouponsetUuid(mCouponset != null ? mCouponset.getUuid() : "")
                             .setCommunicationUuid(mLoyalty.getSessionUUID())
                             .setHasContextualOffer(true)
                             .setSessionId(mCcms.getSessionId())
@@ -191,10 +191,10 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
             nonTelcoDialog();
         }
+        if (mCouponset != null) {
             mTvCouponsetTitle.setText(mCouponset.getName());
             mTvCouponsetSubtitle.setText(HtmlCompat.fromHtml(mCouponset.getDescription(), HtmlCompat.FROM_HTML_MODE_COMPACT));
             mTvCouponsetSubtitle.setMovementMethod(LinkMovementMethod.getInstance());
-        mLlTerms.setOnClickListener(this);
             mTvTermsValue.setText(HtmlCompat.fromHtml(mCouponset.getTerms(), HtmlCompat.FROM_HTML_MODE_COMPACT));
             mTvTermsValue.setMovementMethod(LinkMovementMethod.getInstance());
@@ -212,7 +212,13 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
                         .load(R.drawable.ic_cosmote_logo_horizontal_grey)
                         .into(mIvCouponsetPhoto);
             }
+        } else {
+            Glide.with(this)
+                    .load(R.drawable.ic_cosmote_logo_horizontal_grey)
+                    .into(mIvCouponsetPhoto);
+        }
+        mLlTerms.setOnClickListener(this);
         mIvBack.setOnClickListener(this);
         mLlRedeem.setOnClickListener(this);
 //        mTvTerms.setPaintFlags(mTvTerms.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
@@ -231,9 +237,11 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
                 }
                 mCoupon = new Coupon(result.optJSONObject("result"));
+                if (mCouponset != null) {
                     mCoupon.setDescription(mCouponset.getShortDescription());
                     mCoupon.setImage(mCouponset.getImgPreview());
                     mCoupon.setName(mCouponset.getName());
+                }
                 showDialog(true, 1);
                 WarplyManager.getUserCouponsWithCouponsets(mUserCouponsReceiver);
                 WarplyManager.getCampaigns(mCampaignsCallback);
--- a/warply_android_sdk/src/main/java/ly/warp/sdk/fragments/MyRewardsFragment.java
View file @8cbd78a
+++ b/warply_android_sdk/src/main/java/ly/warp/sdk/fragments/MyRewardsFragment.java
View file @8cbd78a
@@ -579,12 +579,14 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener 
                 /** Hide spinner and hide empty view and show vouchers and hide disabled vouchers */
                 mLlVouchersSpinner.setVisibility(View.GONE);
                 mLlEmptyWallet.setVisibility(View.GONE);
+                if (getContext() != null || (getActivity() != null && !getActivity().isFinishing())) {
                     if (TextUtils.isEmpty(WarpUtils.getLanguage(getContext())) || WarpUtils.getLanguage(getContext()).equals("el")) {
-                    mTvVouchersTitle.setText(getString(R.string.cos_vouchers_title));
+                        mTvVouchersTitle.setText(getContext().getString(R.string.cos_vouchers_title));
-                    mTvVouchersSubtitle.setText(getString(R.string.cos_vouchers_info_title));
+                        mTvVouchersSubtitle.setText(getContext().getString(R.string.cos_vouchers_info_title));
                     } else {
-                    mTvVouchersTitle.setText(getString(R.string.cos_vouchers_title_en));
+                        mTvVouchersTitle.setText(getContext().getString(R.string.cos_vouchers_title_en));
-                    mTvVouchersSubtitle.setText(getString(R.string.cos_vouchers_info_title_en));
+                        mTvVouchersSubtitle.setText(getContext().getString(R.string.cos_vouchers_info_title_en));
+                    }
                 }
                 mLlVouchers.setVisibility(View.VISIBLE);
                 mLlVouchersDisabled.setVisibility(View.GONE);
@@ -603,12 +605,14 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener 
                 mLlVouchersSpinner.setVisibility(View.GONE);
                 mLlEmptyWallet.setVisibility(View.GONE);
                 mLlVouchers.setVisibility(View.GONE);
+                if (getContext() != null || (getActivity() != null && !getActivity().isFinishing())) {
                     if (TextUtils.isEmpty(WarpUtils.getLanguage(getContext())) || WarpUtils.getLanguage(getContext()).equals("el")) {
-                    mTvVouchersDisabledTitle.setText(getString(R.string.cos_vouchers_title));
+                        mTvVouchersDisabledTitle.setText(getContext().getString(R.string.cos_vouchers_title));
-                    mTvVouchersDisabledSubtitle.setText(getString(R.string.cos_vouchers_info_title_disabled));
+                        mTvVouchersDisabledSubtitle.setText(getContext().getString(R.string.cos_vouchers_info_title_disabled));
                     } else {
-                    mTvVouchersDisabledTitle.setText(getString(R.string.cos_vouchers_title_en));
+                        mTvVouchersDisabledTitle.setText(getContext().getString(R.string.cos_vouchers_title_en));
-                    mTvVouchersDisabledSubtitle.setText(getString(R.string.cos_vouchers_info_title_disabled_en));
+                        mTvVouchersDisabledSubtitle.setText(getContext().getString(R.string.cos_vouchers_info_title_disabled_en));
+                    }
                 }
                 mLlVouchersDisabled.setVisibility(View.VISIBLE);
                 if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0)
--- a/warply_android_sdk/src/main/java/ly/warp/sdk/utils/managers/WarplyAnalyticsManager.java
View file @8cbd78a
+++ b/warply_android_sdk/src/main/java/ly/warp/sdk/utils/managers/WarplyAnalyticsManager.java
View file @8cbd78a
@@ -187,6 +187,7 @@ public class WarplyAnalyticsManager {
                 if (metadata != null) {
                     jObj.putOpt("action_metadata", metadata);
                 }
+                if (context != null)
                     Warply.postMicroappData(context, WarpConstants.MICROAPP_INAPP_ANALYTICS, jObj, force);
             } catch (JSONException e) {
                 if (WarpConstants.DEBUG) {
--- a/warply_android_sdk/src/main/java/ly/warp/sdk/views/WarpView.java
View file @8cbd78a
+++ b/warply_android_sdk/src/main/java/ly/warp/sdk/views/WarpView.java
View file @8cbd78a
@@ -791,7 +791,8 @@ public class WarpView extends WebView implements DefaultLifecycleObserver {
         @Override
         public void onReceivedSslError(WebView view, final SslErrorHandler handler, SslError error) {
-            final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+            if (WarpActivity != null && !WarpActivity.isFinishing()) {
+                final AlertDialog.Builder builder = new AlertDialog.Builder(WarpActivity);
                 builder.setTitle("Ειδοποίηση");
                 builder.setMessage("Θα ανακατευθυνθείς σε σελίδα χωρίς έγκυρο πιστοποιητικό");
                 builder.setPositiveButton("Συμφωνώ", new DialogInterface.OnClickListener() {
@@ -809,6 +810,7 @@ public class WarpView extends WebView implements DefaultLifecycleObserver {
                 final AlertDialog dialog = builder.create();
                 dialog.show();
             }
+        }
         @Override
         public void onPageFinished(WebView view, String url) {