Changeset 90ff39

Timestamp:

Sep 15, 2010, 7:17:46 PM (12 years ago)

Author:

rene <just@…>

Branches:

ng_0.6, ng_0.8, ng_0.9

Children:

4bb767

Parents:

250d2d

Message:

moved extraAddedHeader into pref-variable

Files:

• chrome/content/v_identity/vI_getHeader.js (modified) (7 diffs)
• chrome/content/v_identity/vI_upgrade.js (modified) (1 diff)
• defaults/preferences/preferences.js (modified) (1 diff)

chrome/content/v_identity/vI_getHeader.js

@@ -160 +160 @@
     
     hideExtraHeader: function() {
-        var header_list = vI_prepareHeader.addedHeaders
-        for (var index = 0; index < header_list.length; index++) {
-            var header_to_search_splitted=header_list[index].split(/:/)
+        var addedHdrs = vI_prepareHeader.prefroot.getCharPref("extensions.virtualIdentity.smart_reply_added_extraHeaders").split(/ /);
+        for (var index = 0; index < addedHdrs.length; index++) {
+            var header_to_search_splitted=addedHdrs[index].split(/:/)
             var header_to_search=header_to_search_splitted[0].toLowerCase()
             if (typeof(gExpandedHeaderView[header_to_search]) == "object") {
-            if (! gViewAllHeaders) {
-                gExpandedHeaderView[header_to_search].enclosingBox.setAttribute("hidden", true);
-            }
-            else {
-                gExpandedHeaderView[header_to_search].enclosingBox.removeAttribute("hidden");
-            }
+                if (! gViewAllHeaders) {
+                    gExpandedHeaderView[header_to_search].enclosingBox.setAttribute("hidden", true);
+                }
+                else {
+                    gExpandedHeaderView[header_to_search].enclosingBox.removeAttribute("hidden");
+                }
             }
         }
@@ -198 +198 @@
             .createInstance(Components.interfaces.nsIScriptableUnicodeConverter),
             
-    addedHeaders : [],
-    
     observer_added : false,
     
@@ -251 +249 @@
 //      try {
             var extraHdrs = " " + 
-                vI_prepareHeader.prefroot.getCharPref("mailnews.headers.extraExpandedHeaders").toLowerCase()
-                + " ";
+                vI_prepareHeader.prefroot.getCharPref("mailnews.headers.extraExpandedHeaders").toLowerCase();
+
+            var addedHeaders = vI_prepareHeader.prefroot.getCharPref("extensions.virtualIdentity.smart_reply_added_extraHeaders");
 
             for (var index = 0; index < header_list.length; index++) {
@@ -283 +282 @@
                 if (found) continue;
 
-                var addedHeadersString = " " + vI_prepareHeader.addedHeaders.join(" ") + " "
                 if ((extraHdrs.indexOf(" " + headerToSearch + " ") < 0) &&
-                    (addedHeadersString.indexOf(" " + headerToSearch + " ") < 0))
-                    vI_prepareHeader.addedHeaders.push(headerToSearch);
+                    (addedHeaders.indexOf(" " + headerToSearch + " ") < 0))
+                        addedHeaders += " " + headerToSearch;
 //              else vI_notificationBar.dump("## vI_prepareHeader: Header '" + headerToSearch + "' already in extraExpandedHeaders\n");
             }
             
-            if (vI_prepareHeader.addedHeaders.length > 0) {
-                extraHdrs += vI_prepareHeader.addedHeaders.join(" ");
+            addedHeaders = addedHeaders.replace(/^\s+|\s+$/g,"")
+            if (addedHeaders.length > 0) {
+                extraHdrs += " " + addedHeaders;
                 extraHdrs = extraHdrs.replace(/^\s+|\s+$/g,"")
                 vI_prepareHeader.prefroot.setCharPref("mailnews.headers.extraExpandedHeaders", extraHdrs)
-                vI_notificationBar.dump("## vI_prepareHeader: extraExpandedHeaders '" + vI_prepareHeader.addedHeaders.join(" ") + "' added\n");
+                vI_prepareHeader.prefroot.setCharPref("extensions.virtualIdentity.smart_reply_added_extraHeaders", addedHeaders)
+                vI_notificationBar.dump("## vI_prepareHeader: extraExpandedHeaders '" + addedHeaders + "' added\n");
             }       
 
@@ -308 +308 @@
         vI_notificationBar.dump("## vI_prepareHeader: cleanupExtraHeader\n");
 
-        if (vI_prepareHeader.addedHeaders.length > 0) {
+        var addedHdrs = vI_prepareHeader.prefroot.getCharPref("extensions.virtualIdentity.smart_reply_added_extraHeaders").split(/ /);
+
+        if (addedHdrs.length > 0) {
             var extraHdrs = vI_prepareHeader.prefroot.getCharPref("mailnews.headers.extraExpandedHeaders").toLowerCase().split(/ /);
         
-            for (var i = 0; i < vI_prepareHeader.addedHeaders.length; i++) {
+            for (var i = 0; i < addedHdrs.length; i++) {
                 for (var j = 0; j < extraHdrs.length; j++) {
-                    if (extraHdrs[j] == vI_prepareHeader.addedHeaders[i]) {
+                    if (extraHdrs[j] == addedHdrs[i]) {
                         extraHdrs.splice(j,1);
                         break;
@@ -319 +321 @@
                 }
             }
-            vI_prepareHeader.prefroot.setCharPref("mailnews.headers.extraExpandedHeaders", extraHdrs.join(" "))
-            vI_notificationBar.dump("## vI_prepareHeader: extraExpandedHeaders '" + vI_prepareHeader.addedHeaders.join(" ") + "' removed\n");
-            vI_prepareHeader.addedHeaders = [];
+            vI_notificationBar.dump("## vI_prepareHeader: extraExpandedHeaders '" + addedHdrs.join(" ") + "' removed\n");
+            vI_prepareHeader.prefroot.setCharPref("mailnews.headers.extraExpandedHeaders", extraHdrs.join(" "))
+            vI_prepareHeader.prefroot.setCharPref("extensions.virtualIdentity.smart_reply_added_extraHeaders", "")
         }
     },
@@ -341 +343 @@
 //  code adapted from http://xulsolutions.blogspot.com/2006/07/creating-uninstall-script-for.html
     uninstallObserver : {
-        MY_EXTENSION_UUID : "{dddd428e-5ac8-4a81-9f78-276c734f75b8}",
         _uninstall : false,
         observe : function(subject, topic, data) {
-            if (topic == "em-action-requested") {
-                var extension = subject.QueryInterface(Components.interfaces.nsIUpdateItem);
-
-                if (extension.id == this.MY_EXTENSION_UUID) {
-                    if ((data == "item-uninstalled") || (data == "item-disabled")) {
-                        this._uninstall = true;
-                    } else if (data == "item-cancel-action") {
-                        this._uninstall = false;
-                    }
-                }
-            } else if (topic == "quit-application-granted") {
-                if (this._uninstall) {
-                    /* uninstall stuff. */
-                    vI_notificationBar.dump("## vI_uninstall: uninstall/disabledment \n");
-                    vI_prepareHeader.removeExtraHeader();
-                    vI_notificationBar.dump("## vI_uninstall: uninstall/disablement done\n");
-                }
+            if (topic == "quit-application-granted") {
+                /* uninstall stuff. */
+                vI_notificationBar.dump("## vI_uninstall: uninstall/disabledment \n");
+                vI_prepareHeader.removeExtraHeader();
+                vI_notificationBar.dump("## vI_uninstall: uninstall/disablement done\n");
                 this.unregister();
             }
         },
         register : function() {
-            var observerService =
             Components.classes["@mozilla.org/observer-service;1"].
-                getService(Components.interfaces.nsIObserverService);
-
-            observerService.addObserver(this, "em-action-requested", false);
-            observerService.addObserver(this, "quit-application-granted", false);
+                getService(Components.interfaces.nsIObserverService).
+                    addObserver(this, "quit-application-granted", false);
         },
         unregister : function() {
-            var observerService =
-                Components.classes["@mozilla.org/observer-service;1"].
-                getService(Components.interfaces.nsIObserverService);
-
-            observerService.removeObserver(this,"em-action-requested");
-            observerService.removeObserver(this,"quit-application-granted");
+            Components.classes["@mozilla.org/observer-service;1"].
+                getService(Components.interfaces.nsIObserverService).
+                    removeObserver(this,"quit-application-granted");
         }
     }

chrome/content/v_identity/vI_upgrade.js

@@ -206 +206 @@
                 vI_upgrade.__transferMovedUserPrefs(currentVersion);
                 vI_upgrade.__removeObsoleteUserPrefs(currentVersion);
+                vI_upgrade.__removeExtraAddedHeaders(currentVersion);
         }
         vI_rdfDatasource.storeExtVersion();
         vI_notificationBar.dump("extension-upgrade to " + vI_rdfDatasource.getCurrentExtFileVersion() + " done.\n\n");
     },
-        
+    
+    __removeExtraAddedHeaders : function(currentVersion) {
+        if (vI_upgrade.versionChecker.compare(currentVersion, "0.6.9") < 0 && 
+                vI_prepareHeader.prefroot.getCharPref("mailnews.headers.extraExpandedHeaders") != "") {
+            // clean extraExpandedHeaders once, because the whole header-saving and restoring was broken too long
+            vI_prepareHeader.prefroot.setCharPref("mailnews.headers.extraExpandedHeaders", "")
+            vI_notificationBar.dump("cleaned extraExpandedHeaders\n");
+        }
+    },
+    
     __transferMovedUserPrefs : function(currentVersion) {
         // transfer renamed preferences

defaults/preferences/preferences.js

@@ -20 +20 @@
 pref("extensions.virtualIdentity.smart_reply_ignoreFullName", false);
 pref("extensions.virtualIdentity.smart_reply_for_newsgroups", false);
+pref("extensions.virtualIdentity.smart_reply_added_extraHeaders", "");
 pref("extensions.virtualIdentity.smart_detectByReceivedHeader", true);
 pref("extensions.virtualIdentity.autoTimestamp", false);