Commit 1dee797e authored by Wes Johnston's avatar Wes Johnston
Browse files

Bug 941201 - Send old url info in location change messages. r=margaret, a=lsblakk 

CLOSED TREE
parent 850c6c98

mobile/android/base/Tab.java

+4 −3
Original line number Diff line number Diff line
@@ -608,7 +608,8 @@ public class Tab { 


    void handleLocationChange(JSONObject message) throws JSONException {

        final String uri = message.getString("uri");

        mEnteringReaderMode = ReaderModeUtils.isEnteringReaderMode(mUrl, uri);

        final String oldUrl = getURL();

        mEnteringReaderMode = ReaderModeUtils.isEnteringReaderMode(oldUrl, uri);

        updateURL(uri);

        updateUserSearch(message.getString("userSearch"));
@@ -616,7 +617,7 @@ public class Tab { 
        if (message.getBoolean("sameDocument")) {

            // We can get a location change event for the same document with an anchor tag

            // Notify listeners so that buttons like back or forward will update themselves

            Tabs.getInstance().notifyListeners(this, Tabs.TabEvents.LOCATION_CHANGE, uri);

            Tabs.getInstance().notifyListeners(this, Tabs.TabEvents.LOCATION_CHANGE, oldUrl);

            return;

        }
@@ -636,7 +637,7 @@ public class Tab { 
            setAboutHomePage(HomePager.Page.valueOf(homePage));

        }



        Tabs.getInstance().notifyListeners(this, Tabs.TabEvents.LOCATION_CHANGE, uri);

        Tabs.getInstance().notifyListeners(this, Tabs.TabEvents.LOCATION_CHANGE, oldUrl);

    }



    private boolean shouldShowProgress(String url) {