Commit 615e5cba authored by CardBook's avatar CardBook

version 29.8

parent b61d0791
......@@ -36,6 +36,10 @@ if ("undefined" == typeof(wdw_imageEdition)) {
myFile.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0o774);
}
myFile.append(wdw_imageEdition.windowId);
if (!myFile.exists() || !myFile.isDirectory()) {
// read and write permissions to owner and group, read-only for others.
myFile.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0o774);
}
myFile.append(cardbookUtils.getUUID() + "." + aExtension);
return myFile;
},
......
......@@ -888,9 +888,9 @@ if ("undefined" == typeof(cardbookSynchronization)) {
cardbookRepository.cardbookServerGetError[aConnection.connPrefId]++;
if (e.message == "") {
var strBundle = Services.strings.createBundle("chrome://cardbook/locale/cardbook.properties");
cardbookUtils.formatStringForOutput("parsingCardError", [aParams.aPrefIdName, strBundle.GetStringFromName(e.code), cardContent], "Error");
cardbookUtils.formatStringForOutput("parsingCardError", [aParams.aPrefIdName, strBundle.GetStringFromName(e.code), response], "Error");
} else {
cardbookUtils.formatStringForOutput("parsingCardError", [aParams.aPrefIdName, e.message, cardContent], "Error");
cardbookUtils.formatStringForOutput("parsingCardError", [aParams.aPrefIdName, e.message, response], "Error");
}
return;
}
......@@ -2302,6 +2302,7 @@ if ("undefined" == typeof(cardbookSynchronization)) {
}
cardbookRepository.importConflictChoicePersist = false;
cardbookRepository.importConflictChoice = "write";
var cardContent = "";
for (let i = 0; i < fileContentArrayLength; i++) {
if (fileContentArray[i].startsWith("BEGIN:VCARD")) {
cardContent = fileContentArray[i];
......
......@@ -95,7 +95,7 @@ if ("undefined" == typeof(ovl_synchro)) {
prefs.setCharPref("accountsShown", "all");
prefs.setCharPref("accountShown", "");
prefs.setCharPref("uncategorizedCards", "");
prefs.setCharPref("addonVersion", "29.7");
prefs.setCharPref("addonVersion", "29.8");
},
lEventTimerSync : { notify: function(lTimerSync) {
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment