Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 22:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 488170 - Consistently set record cleartext URIs as text spec uris

Browse Source 
Switch cleartext properties to Uri that always takes a text spec, so eventually URI refers to nsIURI. GeneratorURIs seems to have been broken either way.. makeURI of an already URI and storing of a URI into cleartext. This landed with changes to keys, so the server wipe also handles the local name changes.
This commit is contained in:
Edward Lee 2009-04-13 16:39:29 -05:00
parent aff1f185c3
commit 5a136689fb
3 changed files with 13 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
services/sync/modules/engines/bookmarks.js
View File

@ -215,7 +215,7 @@ BookmarksStore.prototype = {
this._log.debug(" \-> is a microsummary");
this._ans.setItemAnnotation(newId, "bookmarks/staticTitle",
record.cleartext.staticTitle || "", 0, this._ans.EXPIRE_NEVER);
let genURI = Utils.makeURI(record.cleartext.generatorURI);
let genURI = Utils.makeURI(record.generatorUri);
if (this._ms) {
try {
let micsum = this._ms.createMicrosummary(uri, genURI);
@ -251,8 +251,8 @@ BookmarksStore.prototype = {
this._log.debug(" -> creating livemark \"" + record.cleartext.title + "\"");
newId = this._ls.createLivemark(parentId,
record.cleartext.title,
Utils.makeURI(record.cleartext.siteURI),
Utils.makeURI(record.cleartext.feedURI),
Utils.makeURI(record.siteUri),
Utils.makeURI(record.feedUri),
record.sortindex);
break;
case "incoming-share":
@ -373,9 +373,9 @@ BookmarksStore.prototype = {
val, 0,
this._ans.EXPIRE_NEVER);
break;
case "generatorURI": {
case "generatorUri": {
try {
let micsumURI = Utils.makeURI(this._bms.getBookmarkURI(itemId));
let micsumURI = this._bms.getBookmarkURI(itemId);
let genURI = Utils.makeURI(val);
if (this._ms == SERVICE_NOT_SUPPORTED) {
this._log.warn("Can't create microsummary -- not supported.");
@ -387,10 +387,10 @@ BookmarksStore.prototype = {
this._log.debug("Could not set microsummary generator URI: " + e);
}
} break;
case "siteURI":
case "siteUri":
this._ls.setSiteURI(itemId, Utils.makeURI(val));
break;
case "feedURI":
case "feedUri":
this._ls.setFeedURI(itemId, Utils.makeURI(val));
break;
case "outgoingSharedAnno":
@ -493,7 +493,7 @@ BookmarksStore.prototype = {
if (this._ms && this._ms.hasMicrosummary(placeId)) {
record = new BookmarkMicsum();
let micsum = this._ms.getMicrosummary(placeId);
record.generatorURI = micsum.generator.uri; // breaks local generators
record.generatorUri = micsum.generator.uri.spec; // breaks local generators
record.staticTitle = this._getStaticTitle(placeId);
} else {
@ -501,7 +501,7 @@ BookmarksStore.prototype = {
record.title = this._bms.getItemTitle(placeId);
}
record.bmkUri = this._bms.getBookmarkURI(placeId);
record.bmkUri = this._bms.getBookmarkURI(placeId).spec;
record.tags = this._getTags(record.bmkUri);
record.keyword = this._bms.getKeywordForBookmark(placeId);
record.description = this._getDescription(placeId);
@ -510,8 +510,8 @@ BookmarksStore.prototype = {
case this._bms.TYPE_FOLDER:
if (this._ls.isLivemark(placeId)) {
record = new Livemark();
record.siteURI = this._ls.getSiteURI(placeId);
record.feedURI = this._ls.getFeedURI(placeId);
record.siteUri = this._ls.getSiteURI(placeId).spec;
record.feedUri = this._ls.getFeedURI(placeId).spec;
} else {
record = new BookmarkFolder();

25
services/sync/modules/type_records/bookmark.js
View File

@ -105,13 +105,6 @@ Bookmark.prototype = {
this._PlacesItem_init(uri);
this.cleartext.type = "bookmark";
},
set bmkUri(value) {
if (typeof(value) == "string")
this.cleartext.bmkUri = value;
else
this.cleartext.bmkUri = value.spec;
},
};
Utils.deferGetSet(Bookmark, "cleartext", ["title", "bmkUri", "description",
@ -130,7 +123,7 @@ BookmarkMicsum.prototype = {
},
};
Utils.deferGetSet(BookmarkMicsum, "cleartext", ["generatorURI", "staticTitle"]);
Utils.deferGetSet(BookmarkMicsum, "cleartext", ["generatorUri", "staticTitle"]);
function BookmarkFolder(uri) {
this._BookmarkFolder_init(uri);
@ -158,23 +151,9 @@ Livemark.prototype = {
this._BookmarkFolder_init(uri);
this.cleartext.type = "livemark";
},
set siteURI(value) {
if (typeof(value) == "string")
this.cleartext.siteURI = value;
else
this.cleartext.siteURI = value? value.spec : "";
},
set feedURI(value) {
if (typeof(value) == "string")
this.cleartext.feedURI = value;
else
this.cleartext.feedURI = value? value.spec : "";
}
};
Utils.deferGetSet(Livemark, "cleartext", ["siteURI", "feedURI"]);
Utils.deferGetSet(Livemark, "cleartext", ["siteUri", "feedUri"]);
function BookmarkSeparator(uri) {
this._BookmarkSeparator_init(uri);

7
services/sync/modules/type_records/history.js
View File

@ -62,13 +62,6 @@ HistoryRec.prototype = {
this.cleartext = {
};
},
set histUri(value) {
if (typeof(value) == "string")
this.cleartext.histUri = value;
else
this.cleartext.histUri = value.spec;
},
};
Utils.deferGetSet(HistoryRec, "cleartext", ["histUri", "title", "visits"]);