Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0458fe39 authored by Sarah Kim's avatar Sarah Kim Committed by Automerger Merge Worker
Browse files

Merge "Fix cookie logic for webviews" into udc-qpr-dev am: d3813b18

parents 95da3c32 d3813b18
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -81,5 +81,7 @@
        Dismiss flow
    </button>
    <p id="dismiss_flow"></p>

    <h2>Test <a href="http://www.google.com">hyperlink</a></h2>
</body>
</html>
+6 −8
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.util.Log;
import android.view.KeyEvent;
import android.webkit.CookieManager;
import android.webkit.WebView;
import android.webkit.WebViewClient;

import com.android.phone.slice.SlicePurchaseController;

@@ -113,8 +114,10 @@ public class SlicePurchaseActivity extends Activity {
            return;
        }

        // Create and configure WebView
        // Clear any cookies that might be persisted from previous sessions before loading WebView
        CookieManager.getInstance().removeAllCookies(value -> {
            setupWebView();
        });
    }

    protected void onPurchaseSuccessful() {
@@ -176,12 +179,7 @@ public class SlicePurchaseActivity extends Activity {
    private void setupWebView() {
        // Create WebView
        mWebView = new WebView(this);

        // Clear any cookies and state that might be saved from previous sessions
        CookieManager.getInstance().removeAllCookies(null);
        CookieManager.getInstance().flush();
        mWebView.clearCache(true);
        mWebView.clearHistory();
        mWebView.setWebViewClient(new WebViewClient());

        // Enable JavaScript for the carrier purchase website to send results back to
        //  the slice purchase application.