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

Commit f43113f6 authored by Patrick Scott's avatar Patrick Scott
Browse files

Unhide setBlockNetworkLoads. 

Blocking network images is not as secure as completely blocking network loads.
Leave setBlockNetworkImage so clients can reduce bandwidth by disabling remote
images. This will allow file:// and content:// URIs to load.
parent 5706329c

api/current.xml

+24 −0
Original line number Diff line number Diff line
@@ -190987,6 +190987,17 @@ 
 visibility="public"

>

</method>

<method name="getBlockNetworkLoads"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getBuiltInZoomControls"

 return="boolean"

 abstract="false"
@@ -191415,6 +191426,19 @@ 
<parameter name="flag" type="boolean">

</parameter>

</method>

<method name="setBlockNetworkLoads"

 return="void"

 abstract="false"

 native="false"

 synchronized="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="flag" type="boolean">

</parameter>

</method>

<method name="setBuiltInZoomControls"

 return="void"

 abstract="false"

core/java/android/webkit/WebSettings.java

+17 −11
Original line number Diff line number Diff line
@@ -916,9 +916,12 @@ public class WebSettings { 
    }



    /**

     * Tell the WebView to block network image. This is only checked when

     * getLoadsImagesAutomatically() is true.

     * @param flag True if the WebView should block network image

     * Tell the WebView to block network images. This is only checked when

     * {@link #getLoadsImagesAutomatically} is true. If you set the value to

     * false, images will automatically be loaded. Use this api to reduce

     * bandwidth only. Use {@link #setBlockNetworkLoads} if possible.

     * @param flag True if the WebView should block network images.

     * @see #setBlockNetworkLoads

     */

    public synchronized void setBlockNetworkImage(boolean flag) {

        if (mBlockNetworkImage != flag) {
@@ -928,17 +931,21 @@ public class WebSettings { 
    }



    /**

     * Return true if the WebView will block network image. The default is false.

     * @return True if the WebView blocks network image.

     * Return true if the WebView will block network images. The default is

     * false.

     * @return True if the WebView blocks network images.

     */

    public synchronized boolean getBlockNetworkImage() {

        return mBlockNetworkImage;

    }



    /**

     * @hide

     * Tell the WebView to block all network load requests.

     * @param flag True if the WebView should block all network loads

     * Tell the WebView to block all network load requests. If you set the

     * value to false, you must call {@link android.webkit.WebView#reload} to

     * fetch remote resources. This flag supercedes the value passed to

     * {@link #setBlockNetworkImage}.

     * @param flag True if the WebView should block all network loads.

     * @see android.webkit.WebView#reload

     */

    public synchronized void setBlockNetworkLoads(boolean flag) {

        if (mBlockNetworkLoads != flag) {
@@ -948,9 +955,8 @@ public class WebSettings { 
    }



    /**

     * @hide

     * Return true if the WebView will block all network loads.

     * The default is false.

     * Return true if the WebView will block all network loads. The default is

     * false.

     * @return True if the WebView blocks all network loads.

     */

    public synchronized boolean getBlockNetworkLoads() {