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

Commit 2f7fa835 authored by Leon Scroggins's avatar Leon Scroggins
Browse files

Save form data when submitted. 

Bug:3280725

Save form data when submitted, rather than when a page
loads.

Requires a change in external/webkit.

Change-Id: I3ff9515ef9e9ab28992cdc8a7beb537752ed1e8c
parent 8adacd8e

core/java/android/webkit/BrowserFrame.java

+21 −21
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import android.content.ComponentCallbacks; 
import android.content.Context;

import android.content.Context;

import android.content.res.AssetManager;

import android.content.res.AssetManager;

import android.content.res.Configuration;

import android.content.res.Configuration;

import android.database.Cursor;

import android.graphics.Bitmap;

import android.graphics.Bitmap;

import android.net.ParseException;

import android.net.ParseException;

import android.net.Uri;

import android.net.Uri;
@@ -29,10 +28,8 @@ import android.net.WebAddress; 
import android.net.http.ErrorStrings;

import android.net.http.ErrorStrings;

import android.net.http.SslCertificate;

import android.net.http.SslCertificate;

import android.net.http.SslError;

import android.net.http.SslError;

import android.os.Bundle;

import android.os.Handler;

import android.os.Handler;

import android.os.Message;

import android.os.Message;

import android.provider.OpenableColumns;

import android.util.Log;

import android.util.Log;

import android.util.TypedValue;

import android.util.TypedValue;

import android.view.Surface;

import android.view.Surface;
@@ -41,7 +38,6 @@ import android.view.WindowManager; 




import junit.framework.Assert;

import junit.framework.Assert;





import java.io.FileNotFoundException;

import java.io.IOException;

import java.io.IOException;

import java.io.InputStream;

import java.io.InputStream;

import java.lang.ref.WeakReference;

import java.lang.ref.WeakReference;
@@ -399,20 +395,31 @@ class BrowserFrame extends Handler { 
                // set to true in didFirstLayout()

                // set to true in didFirstLayout()

                mWebViewCore.removeMessages(WebViewCore.EventHub.WEBKIT_DRAW);

                mWebViewCore.removeMessages(WebViewCore.EventHub.WEBKIT_DRAW);

            }

            }

        }

    }





            // Note: only saves committed form data in standard load

    @SuppressWarnings("unused")

            if (loadType == FRAME_LOADTYPE_STANDARD

    private void saveFormData(HashMap<String, String> data) {

                    && mSettings.getSaveFormData()) {

        if (mSettings.getSaveFormData()) {

            final WebHistoryItem h = mCallbackProxy.getBackForwardList()

            final WebHistoryItem h = mCallbackProxy.getBackForwardList()

                    .getCurrentItem();

                    .getCurrentItem();

            if (h != null) {

            if (h != null) {

                String currentUrl = h.getUrl();

                String currentUrl = h.getUrl();

                if (currentUrl != null) {

                if (currentUrl != null) {

                        mDatabase.setFormData(currentUrl, getFormTextData());

                    mDatabase.setFormData(currentUrl, data);

                }

            }

            }

        }

        }

    }

    }



    @SuppressWarnings("unused")

    private boolean shouldSaveFormData() {

        if (mSettings.getSaveFormData()) {

            final WebHistoryItem h = mCallbackProxy.getBackForwardList()

                    .getCurrentItem();

            return h != null && h.getUrl() != null;

        }

        }

        return false;

    }

    }





    /**

    /**
@@ -1316,13 +1323,6 @@ class BrowserFrame extends Handler { 
     */

     */

    private native void setUsernamePassword(String username, String password);

    private native void setUsernamePassword(String username, String password);





    /**

     * Get form's "text" type data associated with the current frame.

     * @return HashMap If succeed, returns a list of name/value pair. Otherwise

     *         returns null.

     */

    private native HashMap getFormTextData();



    private native String nativeSaveWebArchive(String basename, boolean autoname);

    private native String nativeSaveWebArchive(String basename, boolean autoname);





    private native void nativeOrientationChanged(int orientation);

    private native void nativeOrientationChanged(int orientation);