Skip to content

Commit

Permalink
remove obsolete encode_utf8
Browse files Browse the repository at this point in the history
  • Loading branch information
jobisoft committed Nov 5, 2018
1 parent bc2fd5a commit 94d6723
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions content/provider/eas/calendarsync.js
Expand Up @@ -262,7 +262,7 @@ eas.sync.Calendar = {
wbxml.atag("EndTime", item.endDate ? tbSync.getIsoUtcString(item.endDate) : nowDate.toBasicISOString());

//Location
wbxml.atag("Location", (item.hasProperty("location")) ? tbSync.encode_utf8(item.getProperty("location")) : "");
wbxml.atag("Location", (item.hasProperty("location")) ? item.getProperty("location") : "");

//EAS Reminder (TB getAlarms) - at least with zpush blanking by omitting works, horde does not work
let alarms = item.getAlarms({});
Expand All @@ -285,7 +285,7 @@ eas.sync.Calendar = {
wbxml.atag("Sensitivity", eas.sync.mapThunderbirdPropertyToEas("CLASS", "Sensitivity", item));

//Subject (obmitting these, should remove them from the server - that does not work reliably, so we send blanks)
wbxml.atag("Subject", (item.title) ? tbSync.encode_utf8(item.title) : "");
wbxml.atag("Subject", (item.title) ? item.title : "");

//StartTime in UTC
wbxml.atag("StartTime", item.startDate ? tbSync.getIsoUtcString(item.startDate) : nowDate.toBasicISOString());
Expand Down
4 changes: 2 additions & 2 deletions content/provider/eas/sync.js
Expand Up @@ -734,7 +734,7 @@ eas.sync = {
let categories = item.getCategories({});
if (categories.length > 0) {
wbxml.otag("Categories");
for (let i=0; i<categories.length; i++) wbxml.atag("Category", tbSync.encode_utf8(categories[i]));
for (let i=0; i<categories.length; i++) wbxml.atag("Category", categories[i]);
wbxml.ctag();
} else {
wbxml.atag("Categories");
Expand All @@ -756,7 +756,7 @@ eas.sync = {
let asversion = tbSync.db.getAccountSetting(syncdata.account, "asversion");
let wbxml = tbSync.wbxmltools.createWBXML("", syncdata.type); //init wbxml with "" and not with precodes, also activate type codePage (Calendar, Tasks, Contacts etc)

let description = (item.hasProperty("description")) ? tbSync.encode_utf8(item.getProperty("description")) : "";
let description = (item.hasProperty("description")) ? item.getProperty("description") : "";
if (asversion == "2.5") {
wbxml.atag("Body", description);
} else {
Expand Down
2 changes: 1 addition & 1 deletion content/provider/eas/tasksync.js
Expand Up @@ -107,7 +107,7 @@ eas.sync.Tasks = {
//Order of tags taken from: https://msdn.microsoft.com/en-us/library/dn338924(v=exchg.80).aspx

//Subject
wbxml.atag("Subject", (item.title) ? tbSync.encode_utf8(item.title) : "");
wbxml.atag("Subject", (item.title) ? item.title : "");

//Body
wbxml.append(eas.sync.getItemBody(item, syncdata));
Expand Down

0 comments on commit 94d6723

Please sign in to comment.