From aa47f096dae8369df73798510ac901c36f312134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Sun, 22 Dec 2019 12:45:58 +0300 Subject: [PATCH] apiconstants --- .../ch/pizzaleu/android/api/ApiConstants.java | 2 ++ .../createOrder/CreateOrderSummaryFragment.java | 15 ++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java b/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java index 56b4097..6f595c2 100644 --- a/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java @@ -46,5 +46,7 @@ public class ApiConstants { public static final String PAYMENT_WEBVIEW_URL_POSTFINANCE_TWINT = "https://pizza-leu.ch/pizzaleu/index.php?route=mobile/service/postFinancePayment&order_id="; public static final String PAYMENT_WEBVIEW_SUCCESS_POSTFINANCE_TWINT = "postFinancePaymentIsSuccess"; public static final String PAYMENT_WEBVIEW_FAIL_POSTFINANCE_TWINT = "postFinancePaymentIsFailed"; + public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTP = "http://www.pizza-leu.ch/"; + public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTPS = "https://www.pizza-leu.ch/"; } diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java index 1c16b98..1227efd 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java @@ -1125,13 +1125,13 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { request.getUrl().toString().contains(ApiConstants.PAYMENT_WEBVIEW_FAIL_POSTFINANCE_TWINT)){ createOrderActivity.setPaymentWebViewVisibility(false); } - else if(request.getUrl().toString().equals("http://www.pizza-leu.ch/") || - request.getUrl().toString().equals("https://www.pizza-leu.ch/")){ + else if(request.getUrl().toString().equals(ApiConstants.PAYMENT_WEBVIEW_MAIN_PAGE_HTTP) || + request.getUrl().toString().equals(ApiConstants.PAYMENT_WEBVIEW_MAIN_PAGE_HTTPS)){ createOrderActivity.setPaymentWebViewVisibility(false); createOrderActivity.onNextClicked(FRAGMENT_NAME); } - else if(request.getUrl().toString().contains("http://www.pizza-leu.ch/") || - request.getUrl().toString().contains("https://www.pizza-leu.ch/")){ + else if(request.getUrl().toString().contains(ApiConstants.PAYMENT_WEBVIEW_MAIN_PAGE_HTTP) || + request.getUrl().toString().contains(ApiConstants.PAYMENT_WEBVIEW_MAIN_PAGE_HTTPS)){ createOrderActivity.setPaymentWebViewVisibility(false); DialogHelper.showAlertDialog(BaseActivity.currentActivity, getString(R.string.error_message)); } @@ -1145,12 +1145,13 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { url.contains(ApiConstants.PAYMENT_WEBVIEW_FAIL_POSTFINANCE_TWINT)){ createOrderActivity.setPaymentWebViewVisibility(false); } - else if(url.equals("http://www.pizza-leu.ch/") || - url.equals("https://www.pizza-leu.ch/")){ + else if(url.equals(ApiConstants.PAYMENT_WEBVIEW_MAIN_PAGE_HTTP) || + url.equals(ApiConstants.PAYMENT_WEBVIEW_MAIN_PAGE_HTTPS)){ createOrderActivity.setPaymentWebViewVisibility(false); createOrderActivity.onNextClicked(FRAGMENT_NAME); } - else if(url.contains("http://www.pizza-leu.ch/") || url.contains("https://www.pizza-leu.ch/")){ + else if(url.contains(ApiConstants.PAYMENT_WEBVIEW_MAIN_PAGE_HTTP) || + url.contains(ApiConstants.PAYMENT_WEBVIEW_MAIN_PAGE_HTTPS)){ createOrderActivity.setPaymentWebViewVisibility(false); DialogHelper.showAlertDialog(BaseActivity.currentActivity, getString(R.string.error_message)); }