Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 781883 - Move the Content:LocationChange handler into Tabs.java so that we don't miss the event when GeckoApp is torn down and recreated. r=sriram

Browse Source
This commit is contained in:
Kartikaya Gupta 2012-08-27 16:44:51 -04:00
parent dae7a6b366
commit 21759d6ed8
3 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mobile/android/base/GeckoApp.java
View File

@ -669,36 +669,6 @@ abstract public class GeckoApp
mFormAssistPopup.hide();
}
void handleLocationChange(final int tabId, final String uri,
final String documentURI, final String contentType,
final boolean sameDocument) {
final Tab tab = Tabs.getInstance().getTab(tabId);
if (tab == null)
return;
tab.updateURL(uri);
tab.setDocumentURI(documentURI);
// We can get a location change event for the same document with an anchor tag
if (sameDocument)
return;
tab.setContentType(contentType);
tab.clearFavicon();
tab.updateTitle(null);
tab.updateIdentityData(null);
tab.setReaderEnabled(false);
tab.setZoomConstraints(new ZoomConstraints(true));
tab.setHasTouchListeners(false);
tab.setCheckerboardColor(Color.WHITE);
mMainHandler.post(new Runnable() {
public void run() {
Tabs.getInstance().notifyListeners(tab, Tabs.TabEvents.LOCATION_CHANGE, uri);
}
});
}
void handleSecurityChange(final int tabId, final JSONObject identityData) {
final Tab tab = Tabs.getInstance().getTab(tabId);
if (tab == null)
@ -884,14 +854,6 @@ abstract public class GeckoApp
// generic log listener
final String msg = message.getString("msg");
Log.i(LOGTAG, "Log: " + msg);
} else if (event.equals("Content:LocationChange")) {
final int tabId = message.getInt("tabID");
final String uri = message.getString("uri");
final String documentURI = message.getString("documentURI");
final String contentType = message.getString("contentType");
final boolean sameDocument = message.getBoolean("sameDocument");
Log.i(LOGTAG, "URI - " + uri);
handleLocationChange(tabId, uri, documentURI, contentType, sameDocument);
} else if (event.equals("Content:SecurityChange")) {
final int tabId = message.getInt("tabID");
final JSONObject identity = message.getJSONObject("identity");
@ -1656,7 +1618,6 @@ abstract public class GeckoApp
registerEventListener("DOMLinkAdded");
registerEventListener("DOMWindowClose");
registerEventListener("log");
registerEventListener("Content:LocationChange");
registerEventListener("Content:SecurityChange");
registerEventListener("Content:ReaderEnabled");
registerEventListener("Content:StateChange");
@ -2099,7 +2060,6 @@ abstract public class GeckoApp
unregisterEventListener("DOMLinkAdded");
unregisterEventListener("DOMWindowClose");
unregisterEventListener("log");
unregisterEventListener("Content:LocationChange");
unregisterEventListener("Content:SecurityChange");
unregisterEventListener("Content:ReaderEnabled");
unregisterEventListener("Content:StateChange");

26
mobile/android/base/Tab.java
View File

@ -529,6 +529,32 @@ public final class Tab {
}
}
void handleLocationChange(JSONObject message) throws JSONException {
final String uri = message.getString("uri");
updateURL(uri);
setDocumentURI(message.getString("documentURI"));
if (message.getBoolean("sameDocument")) {
// We can get a location change event for the same document with an anchor tag
return;
}
setContentType(message.getString("contentType"));
clearFavicon();
updateTitle(null);
updateIdentityData(null);
setReaderEnabled(false);
setZoomConstraints(new ZoomConstraints(true));
setHasTouchListeners(false);
setCheckerboardColor(Color.WHITE);
GeckoApp.mAppContext.mMainHandler.post(new Runnable() {
public void run() {
Tabs.getInstance().notifyListeners(Tab.this, Tabs.TabEvents.LOCATION_CHANGE, uri);
}
});
}
private void saveThumbnailToDB() {
try {
String url = getURL();

6
mobile/android/base/Tabs.java
View File

@ -49,6 +49,7 @@ public class Tabs implements GeckoEventListener {
registerEventListener("Tab:Added");
registerEventListener("Tab:Close");
registerEventListener("Tab:Select");
registerEventListener("Content:LocationChange");
registerEventListener("Session:RestoreBegin");
registerEventListener("Session:RestoreEnd");
registerEventListener("Reader:Added");
@ -253,6 +254,11 @@ public class Tabs implements GeckoEventListener {
closeTab(tab);
} else if (event.equals("Tab:Select")) {
selectTab(message.getInt("tabID"));
} else if (event.equals("Content:LocationChange")) {
Tab tab = getTab(message.getInt("tabID"));
if (tab != null) {
tab.handleLocationChange(message);
}
} else if (event.equals("Session:RestoreBegin")) {
mRestoringSession = true;
} else if (event.equals("Session:RestoreEnd")) {