From 4ebcba51660bf390fce91aa4d970637eff491d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Sun, 22 Dec 2019 16:38:47 +0300 Subject: [PATCH] back action removed gfor webview --- .../java/ch/pizzaleu/android/activity/CreateOrderActivity.java | 2 ++ .../fragment/createOrder/CreateOrderSummaryFragment.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/src/main/java/ch/pizzaleu/android/activity/CreateOrderActivity.java b/app/src/main/java/ch/pizzaleu/android/activity/CreateOrderActivity.java index 5d494d3..32bef61 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/CreateOrderActivity.java +++ b/app/src/main/java/ch/pizzaleu/android/activity/CreateOrderActivity.java @@ -252,6 +252,7 @@ public class CreateOrderActivity extends BaseActivity { } } + /* @Override public void onBackPressed() { if(paymentWebView.getVisibility() == View.VISIBLE){ @@ -266,6 +267,7 @@ public class CreateOrderActivity extends BaseActivity { super.onBackPressed(); } } + */ public void setOrderNote(String orderNote){ this.orderNote = orderNote; 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 0ecb348..878a4e6 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 @@ -1103,6 +1103,8 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { private void showPaymentWebView(int orderId){ createOrderActivity.setPaymentWebViewVisibility(true); final WebView paymentWebView = createOrderActivity.getPaymentWebView(); + paymentWebView.loadUrl("about:blank"); + paymentWebView.clearHistory(); paymentWebView.setVisibility(View.VISIBLE); paymentWebView.getSettings().setJavaScriptEnabled(true); paymentWebView.setWebViewClient(new WebViewClient(){