Changeset 9cedc0

Timestamp:

Sep 25, 2011, 9:23:06 PM (11 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

284956

Parents:

7666cb

Message:

compatibility for conversation plugin

Location:

chrome/content/v_identity

Files:

• vI_Dialog.js (modified) (1 diff)
• vI_account.js (modified) (15 diffs)
• vI_getHeader.js (modified) (8 diffs)
• vI_identityData.js (modified) (11 diffs)
• vI_msgIdentityCloneTools.js (modified) (4 diffs)
• vI_prefDialog.js (modified) (1 diff)
• vI_prefDialog.xul (modified) (1 diff)
• vI_rdfDatasource.js (modified) (15 diffs)
• vI_smartIdentity.js (modified) (17 diffs)
• vI_storage.js (modified) (6 diffs)
• vI_upgrade.js (modified) (1 diff)
• vI_upgradeOverlay.js (modified) (1 diff)
• vI_upgradeOverlay.xul (modified) (1 diff)
• v_identity.js (modified) (9 diffs)
• v_identity.xul (modified) (1 diff)

chrome/content/v_identity/vI_Dialog.js

@@ -31 +31 @@
 
     init : function(warning) {
+        dump("warning.class=" + warning.class + "warning.class=" + warning.title + "warning.warning=" + warning.warning + "\n")
         document.getElementById("vI_Dialog").setAttribute("class", warning.class); 
         Dialog.setDescription(document.getElementById("vI_Dialog_title"), warning.title);

chrome/content/v_identity/vI_account.js

@@ -24 +24 @@
 
 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+function prepareSendMsg(vid, msgType, identityData, baseIdentity, recipients) {
+    var stringBundle = Services.strings.createBundle("chrome://v_identity/locale/v_identity.properties");
+    
+    var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+        .getService(Components.interfaces.nsIPromptService);
+    
+    var prefs = Components.classes["@mozilla.org/preferences-service;1"]
+            .getService(Components.interfaces.nsIPrefService)
+            .getBranch("extensions.virtualIdentity.");
+    
+    var AccountManager = Components.classes["@mozilla.org/messenger/account-manager;1"]
+            .getService(Components.interfaces.nsIMsgAccountManager);
+            
+    if (vI.notificationBar) vI.notificationBar.dump("\n## prepareSendMsg " + msgType + " " + Components.interfaces.nsIMsgCompDeliverMode.Now + "\n");
+    
+    returnValue = {};
+    
+    if (msgType == Components.interfaces.nsIMsgCompDeliverMode.Now) {
+        if ( (vid && prefs.getBoolPref("warn_virtual") &&
+            !(promptService.confirm(window,"Warning",
+                stringBundle.GetStringFromName("vident.sendVirtual.warning")))) ||
+            (!vid && prefs.getBoolPref("warn_nonvirtual") &&
+            !(promptService.confirm(window,"Warning",
+                stringBundle.GetStringFromName("vident.sendNonvirtual.warning")))) ) {
+            return { update : "abort", storedIdentity : null }; // completely abort sending
+        }
+        if (prefs.getBoolPref("storage") &&
+                (!vI.statusmenu || vI.statusmenu.objStorageSaveMenuItem.getAttribute("checked") == "true")) {
+            var localeDatasourceAccess = new vI.rdfDatasourceAccess();
+            var returnValue = localeDatasourceAccess.storeVIdentityToAllRecipients(identityData, recipients)
+            if ( returnValue.update == "abort" || returnValue.update == "takeover" ) {
+                if (vI.notificationBar) vI.notificationBar.dump("## prepareSendMsg: sending aborted\n");
+                return returnValue;
+            }
+        }
+        else if (vI.notificationBar) vI.notificationBar.dump("## prepareSendMsg: storage deactivated\n");
+    }
+    if (vid) {
+        vI.account.removeUsedVIAccount();
+        vI.account.createAccount(identityData, baseIdentity);
+    }
+    return { update : "accept", storedIdentity : null };
+};
+
+function finalCheck(virtualIdentityData, currentIdentity) {
+    var stringBundle = Services.strings.createBundle("chrome://v_identity/locale/v_identity.properties");
+
+    // vI.identityData(email, fullName, id, smtp, extras, sideDescription, existingID)
+    var currentIdentityData = new vI.identityData(currentIdentity.email, currentIdentity.fullName, null, currentIdentity.smtpServerKey, null, null, null);
+    
+    if (vI.notificationBar) vI.notificationBar.dump("\n## vI.identityData SendMessage Final Check\n");
+    if (vI.notificationBar) vI.notificationBar.dump("## vI.identityData currentIdentity: fullName='" + currentIdentityData.fullName + "' email='" + currentIdentityData.email + "' smtp='" + currentIdentityData.smtp.key + "'\n");
+    if (vI.notificationBar) vI.notificationBar.dump("## vI.identityData virtualIdentityData: fullName='" + virtualIdentityData.fullName + "' email='" + virtualIdentityData.email + "' smtp='" + virtualIdentityData.smtp.key + "'\n");
+
+    if  (currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase()   &&
+        currentIdentityData.email.toLowerCase() == virtualIdentityData.email.toLowerCase()      &&
+        virtualIdentityData.smtp.equal(currentIdentityData.smtp)    ) {
+            return true
+    }
+    else {
+        if (!(currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase())) vI.notificationBar.dump("\n## vI.identityData failed check for fullName.\n");
+        if (!(currentIdentityData.email.toLowerCase() == virtualIdentityData.email.toLowerCase())) vI.notificationBar.dump("\n## vI.identityData failed check for email.\n");
+        if (!(virtualIdentityData.smtp.equal(currentIdentityData.smtp))) vI.notificationBar.dump("\n## vI.identityData failed check for SMTP.\n");
+        alert(stringBundle.getStringFromName("vident.genericSendMessage.error"));
+        return false
+    }   
+};
+
 var account = {
     _account : null,
     
+    _baseIdentity : null,
+
     _AccountManager : Components.classes["@mozilla.org/messenger/account-manager;1"]
         .getService(Components.interfaces.nsIMsgAccountManager),
@@ -34 +104 @@
         .getBranch(null),
 
-    _getBaseIdentity : function () {
-        return account._AccountManager.getIdentity(vI.main.elements.Obj_MsgIdentity.value);
-    },
-
+    _pref : Components.classes["@mozilla.org/preferences-service;1"]
+        .getService(Components.interfaces.nsIPrefService)
+        .getBranch("extensions.virtualIdentity."),
+    
+    _unicodeConverter : Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]
+            .createInstance(Components.interfaces.nsIScriptableUnicodeConverter),
+    
     _copyBoolAttribute : function(name) {
         account._account.defaultIdentity.setBoolAttribute(name,
-                account._getBaseIdentity().getBoolAttribute(name));
+                account._baseIdentity.getBoolAttribute(name));
     },
     
     _copyIntAttribute : function(name) {
         account._account.defaultIdentity.setIntAttribute(name,
-                account._getBaseIdentity().getIntAttribute(name));
+                account._baseIdentity.getIntAttribute(name));
     },
 
     _copyCharAttribute : function(name) {
         account._account.defaultIdentity.setCharAttribute(name,
-                account._getBaseIdentity().getCharAttribute(name));
+                account._baseIdentity.getCharAttribute(name));
     },
 
     _copyUnicharAttribute : function(name) {
         account._account.defaultIdentity.setUnicharAttribute(name,
-                account._getBaseIdentity().getUnicharAttribute(name));
-    },
-
-    copyPreferences : function() {
-        if (vI.main.preferences.getBoolPref("copySMIMESettings")) {
+                account._baseIdentity.getUnicharAttribute(name));
+    },
+
+    _copyPreferences : function() {
+        if (account._pref.getBoolPref("copySMIMESettings")) {
             // SMIME settings
             vI.notificationBar.dump("## account: copy S/MIME settings\n")
@@ -67 +140 @@
         }
 /*      seems not required, encryption happens before Virtual Identity account is created
-        if (vI.main.preferences.getBoolPref("copyEnigmailSettings")) {
+        if (account._pref.getBoolPref("copyEnigmailSettings")) {
             // pgp/enigmail settings
             vI.notificationBar.dump("## account: copy PGP settings\n")
@@ -80 +153 @@
             account._copyIntAttribute("defaultEncryptionPolicy");
         }   */
-        if (vI.main.preferences.getBoolPref("copyAttachVCardSettings")) {
+        if (account._pref.getBoolPref("copyAttachVCardSettings")) {
             // attach vcard
             vI.notificationBar.dump("## account: copy VCard settings\n")
@@ -203 +276 @@
     },
     
-    createAccount : function()
+    createAccount : function(identityData, baseIdentity)
     {
         if (account._account) {  // if the Account is still created, then leave all like it is
@@ -209 +282 @@
             return;
         }
+        account._baseIdentity = baseIdentity;
         /*
         // the easiest way would be to get all requiered Attributes might be to duplicate the default account like this
@@ -220 +294 @@
         account._account = account._AccountManager.createAccount();
         account._prefroot.setBoolPref("mail.account." + account._account.key + ".vIdentity", true)
-        
         account._account.addIdentity(account._AccountManager.createIdentity());
-    
         // the new account uses the same incomingServer than the base one,
         // it's especially required for NNTP cause incomingServer is used for sending newsposts.
         // by pointing to the same incomingServer stored passwords can be reused
         // the incomingServer has to be replaced before the account is removed, else it get removed ether
-        var servers = account._AccountManager.GetServersForIdentity(account._getBaseIdentity());
+        var servers = account._AccountManager.GetServersForIdentity(baseIdentity);
         var server = servers.QueryElementAt(0, Components.interfaces.nsIMsgIncomingServer);
-        
         // we mark the server as invalid so that the account manager won't
         // tell RDF about the new server - we don't need this server for long
@@ -236 +307 @@
         account._account.incomingServer = server;
         server.valid = true;
-
-        account.copyMsgIdentityClone();
-        account.copyPreferences();
-        account.setupFcc();
-        account.setupDraft();
-        account.setupTemplates();
-    },
-    
-    copyMsgIdentityClone : function() {
-        var identityData = document.getElementById("msgIdentity_clone").identityData;
+        account._copyIdentityData(identityData, baseIdentity);
+        account._copyPreferences();
+        account._unicodeConverter.charset = "UTF-8";
+        account._setupFcc();
+        account._setupDraft();
+        account._setupTemplates();
+    },
+    
+    _copyIdentityData : function(identityData, baseIdentity) {
         account._account.defaultIdentity.setCharAttribute("useremail", identityData.email);
         account._account.defaultIdentity.setUnicharAttribute("fullName", identityData.fullName);
         
         account._account.defaultIdentity.smtpServerKey = identityData.smtp.keyNice; // key with "" for vI.DEFAULT_SMTP_TAG
+        if (account._account.defaultIdentity.smtpServerKey == virtualIdentityExtension.NO_SMTP_TAG)
+            account._account.defaultIdentity.smtpServerKey = baseIdentity.smtpServerKey;
 
         vI.notificationBar.dump("## account: Stored virtualIdentity (name "
@@ -257 +329 @@
     },
     
-    setupFcc : function()
+    _setupFcc : function()
     {
-        if (document.getElementById("fcc_switch").getAttribute("checked")) {
-            switch (vI.main.preferences.getCharPref("fccFolderPickerMode"))
+        // fcc_switch is only available in modified ComposeDialog.
+        // XXXXX get rid of this Elem reference
+        var doFcc = true;
+        try { doFcc = document.getElementById("fcc_switch").getAttribute("checked") } catch(e) { }
+        if (doFcc) {
+            switch (account._pref.getCharPref("fccFolderPickerMode"))
             {
                 case "2"  :
@@ -271 +347 @@
                 case "3"  :
                 vI.notificationBar.dump ("## account: preparing Fcc --- use Settings of Modified Account\n");
-                account._account.defaultIdentity.doFcc = account._getBaseIdentity().doFcc;
-                account._account.defaultIdentity.fccFolder = account._getBaseIdentity().fccFolder;
-                account._account.defaultIdentity.fccFolderPickerMode = account._getBaseIdentity().fccFolderPickerMode;
-                account._account.defaultIdentity.fccReplyFollowsParent = account._getBaseIdentity().fccReplyFollowsParent;
+                account._account.defaultIdentity.doFcc = account._baseIdentity.doFcc;
+                account._account.defaultIdentity.fccFolder = account._baseIdentity.fccFolder;
+                account._account.defaultIdentity.fccFolderPickerMode = account._baseIdentity.fccFolderPickerMode;
+                account._account.defaultIdentity.fccReplyFollowsParent = account._baseIdentity.fccReplyFollowsParent;
                 break;
                 default  :
                 vI.notificationBar.dump ("## account: preparing Fcc --- use Virtual Identity Settings\n");
                 account._account.defaultIdentity.doFcc
-                    = vI.main.preferences.getBoolPref("doFcc");
+                    = account._pref.getBoolPref("doFcc");
                 account._account.defaultIdentity.fccFolder
-                    = vI.main.unicodeConverter.ConvertToUnicode(vI.main.preferences.getCharPref("fccFolder"));
+                    = account._unicodeConverter.ConvertToUnicode(account._pref.getCharPref("fccFolder"));
                 account._account.defaultIdentity.fccFolderPickerMode
-                    = vI.main.preferences.getCharPref("fccFolderPickerMode");
-                account._account.defaultIdentity.fccReplyFollowsParent = vI.main.preferences.getBoolPref("fccReplyFollowsParent");
+                    = account._pref.getCharPref("fccFolderPickerMode");
+                account._account.defaultIdentity.fccReplyFollowsParent = account._pref.getBoolPref("fccReplyFollowsParent");
 
                 break;
@@ -296 +372 @@
             account._account.defaultIdentity.fccFolder + " fccFolderPickerMode " +
             account._account.defaultIdentity.fccFolderPickerMode + "(" +
-            vI.main.preferences.getCharPref("fccFolderPickerMode") + "))\n");
-    },
-    
-    setupDraft : function() {
-        switch (vI.main.preferences.getCharPref("draftFolderPickerMode"))
+            account._pref.getCharPref("fccFolderPickerMode") + "))\n");
+    },
+    
+    _setupDraft : function()    {
+        switch (account._pref.getCharPref("draftFolderPickerMode"))
         {
             case "2"  :
@@ -309 +385 @@
             case "3"  :
             vI.notificationBar.dump ("## account: preparing Draft --- use Settings of Modified Account\n");
-            account._account.defaultIdentity.draftFolder = account._getBaseIdentity().draftFolder;
-            account._account.defaultIdentity.draftsFolderPickerMode = account._getBaseIdentity().draftsFolderPickerMode;
+            account._account.defaultIdentity.draftFolder = account._baseIdentity.draftFolder;
+            account._account.defaultIdentity.draftsFolderPickerMode = account._baseIdentity.draftsFolderPickerMode;
             break;
             default  :
             vI.notificationBar.dump ("## account: preparing Draft --- use Virtual Identity Settings\n");
             account._account.defaultIdentity.draftFolder
-                = vI.main.unicodeConverter.ConvertToUnicode(vI.main.preferences.getCharPref("draftFolder"));
+                = account._unicodeConverter.ConvertToUnicode(account._pref.getCharPref("draftFolder"));
             account._account.defaultIdentity.draftsFolderPickerMode
-                = vI.main.preferences.getCharPref("draftFolderPickerMode");
+                = account._pref.getCharPref("draftFolderPickerMode");
             break;
         }
@@ -323 +399 @@
             account._account.defaultIdentity.draftFolder + " draftsFolderPickerMode " +
             account._account.defaultIdentity.draftsFolderPickerMode + "(" +
-            vI.main.preferences.getCharPref("draftFolderPickerMode") + "))\n");
-    },
-    
-    setupTemplates : function() {
-        switch (vI.main.preferences.getCharPref("stationeryFolderPickerMode"))
+            account._pref.getCharPref("draftFolderPickerMode") + "))\n");
+    },
+    
+    _setupTemplates : function()    {
+        switch (account._pref.getCharPref("stationeryFolderPickerMode"))
         {
             case "2"  :
@@ -336 +412 @@
             case "3"  :
             vI.notificationBar.dump ("## account: preparing Templates --- use Settings of Modified Account\n");
-            account._account.defaultIdentity.stationeryFolder = account._getBaseIdentity().stationeryFolder;
-            account._account.defaultIdentity.tmplFolderPickerMode = account._getBaseIdentity().tmplFolderPickerMode;
+            account._account.defaultIdentity.stationeryFolder = account._baseIdentity.stationeryFolder;
+            account._account.defaultIdentity.tmplFolderPickerMode = account._baseIdentity.tmplFolderPickerMode;
             break;
             default  :
             vI.notificationBar.dump ("## account: preparing Templates --- use Virtual Identity Settings\n");
             account._account.defaultIdentity.stationeryFolder
-                = vI.main.unicodeConverter.ConvertToUnicode(vI.main.preferences.getCharPref("stationeryFolder"));
+                = account._unicodeConverter.ConvertToUnicode(account._pref.getCharPref("stationeryFolder"));
             account._account.defaultIdentity.tmplFolderPickerMode
-                = vI.main.preferences.getCharPref("stationeryFolderPickerMode");
+                = account._pref.getCharPref("stationeryFolderPickerMode");
             break;
         }
@@ -350 +426 @@
             account._account.defaultIdentity.stationeryFolder + " tmplFolderPickerMode " +
             account._account.defaultIdentity.tmplFolderPickerMode + "(" +
-            vI.main.preferences.getCharPref("stationeryFolderPickerMode") + "))\n");
+            account._pref.getCharPref("stationeryFolderPickerMode") + "))\n");
     }
 }
 vI.account = account;
+vI.prepareSendMsg = prepareSendMsg;
+vI.finalCheck = finalCheck;
 }});

chrome/content/v_identity/vI_getHeader.js

@@ -40 +40 @@
 
 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+// var storedHeaders = { };
 var getHeader = {
     messenger: null,
@@ -90 +91 @@
         // create array to count the header
         var currentHeadersCounter = [];
+//      storedHeaders = { };
         
         var listId = false; var received = false; var content_base = false;
@@ -99 +101 @@
             if (!listId && headerName == "list-id") {
                 hdr.setStringProperty("vI_list-id","found"); listId = true;
+//              storedHeaders["vI_list-id"] = "found";
                 vI.notificationBar.dump("## getHeader: found header: list-id  ...stored to recognize mailing-list\n");
 //              continue;
@@ -106 +109 @@
             if (!received && headerName == "received") {
                 hdr.setStringProperty("vI_received","found"); received = true;
+//              storedHeaders["vI_received"] = "found";
                 vI.notificationBar.dump("## getHeader: found header: received  ...stored to recognize received mail\n");
 //              continue;
@@ -113 +117 @@
             if (!content_base && headerName == "content-base") {
                 hdr.setStringProperty("vI_content_base","found"); content_base = true;
+//              storedHeaders["vI_content_base"] = "found";
                 vI.notificationBar.dump("## getHeader: found header: content-base  ...stored to recognize blog/news-feed\n");
 //              continue;
@@ -130 +135 @@
                         ", " + value;
                     hdr.setStringProperty(getHeader.headerToSearch[index].headerNameToStore,getHeader.unicodeConverter.ConvertFromUnicode(value) + getHeader.unicodeConverter.Finish());
+                    
+//                  storedHeaders[getHeader.headerToSearch[index].headerNameToStore] = getHeader.unicodeConverter.ConvertFromUnicode(value) + getHeader.unicodeConverter.Finish();
 
                     var storedValue = hdr.getProperty(getHeader.headerToSearch[index].headerNameToStore)
@@ -136 +143 @@
                         "[:" + currentHeadersCounter[headerName] + "] - stored as '" + 
                         storedConvValue + "'\n");
+/*                  vI.notificationBar.dump("## getHeader: additional stored header: " + getHeader.headerToSearch[index].headerNameToStore +
+                        " '" + storedHeaders[getHeader.headerToSearch[index].headerNameToStore] + "'\n");*/
                     if (!found) { 
                         subtitle = getHeader.strings.getString("vident.getHeader.headerFound");
@@ -376 +385 @@
 window.addEventListener("load", function(e) { prepareHeader.init(); }, false);
 window.addEventListener("unload", function(e) { prepareHeader.cleanup(); }, false);
+// vI.storedHeaders = storedHeaders;
 }});

chrome/content/v_identity/vI_identityData.js

@@ -30 +30 @@
     this.id = new idObj(id);
     this.smtp = new smtpObj(smtp);
-    this.extras = extras?extras:new vI.storageExtras();
+    if (extras) this.extras = extras;
+    else if (typeof(vI.storageExtras)=='function') this.extras = new vI.storageExtras();
     this.comp = {   // holds the results of the last comparison for later creation of a compareMatrix
         compareID : null,
@@ -38 +39 @@
     if (existingID) this.existingID = existingID;
     else if (this.id.value) this.sideDescription = " - " + this.id.value;
-    this.stringBundle = document.getElementById("vIdentBundle");
+    this.stringBundle = Components.classes["@mozilla.org/intl/stringbundle;1"]
+                        .getService(Components.interfaces.nsIStringBundleService)
+                        .createBundle("chrome://v_identity/locale/v_identity.properties");
 }
 identityData.prototype = {
+    _prefroot : Components.classes["@mozilla.org/preferences-service;1"]
+        .getService(Components.interfaces.nsIPrefService)
+        .getBranch(null),
+
+    _pref : Components.classes["@mozilla.org/preferences-service;1"]
+        .getService(Components.interfaces.nsIPrefService)
+        .getBranch("extensions.virtualIdentity."),
+
     _email : null,          // internal email-field might contain combinedName (until first queried via email)
     _fullName : null,
@@ -99 +110 @@
     get combinedNameHtml() { return this.__makeHtml(this.combinedName); },
 
-    get idLabel() { return this.stringBundle.getString("vident.identityData.baseID") },
-    get smtpLabel() { return this.stringBundle.getString("vident.identityData.SMTP") },
-    get fullNameLabel() { return this.stringBundle.getString("vident.identityData.Name") },
-    get emailLabel() { return this.stringBundle.getString("vident.identityData.Address") },
+    get idLabel() { return this.stringBundle.GetStringFromName("vident.identityData.baseID") },
+    get smtpLabel() { return this.stringBundle.GetStringFromName("vident.identityData.SMTP") },
+    get fullNameLabel() { return this.stringBundle.GetStringFromName("vident.identityData.Name") },
+    get emailLabel() { return this.stringBundle.GetStringFromName("vident.identityData.Address") },
 
     // creates an Duplicate of the current IdentityData, cause usually we are working with a pointer
     getDuplicate : function() {
-        return new identityData(this.email, this.fullName, this.id.key, this.smtp.key, this.extras.getDuplicate(), this.sideDescription, this.existingID);
+        return new identityData(this.email, this.fullName, this.id.key, this.smtp.key, this.extras?this.extras.getDuplicate():null, this.sideDescription, this.existingID);
     },
 
@@ -116 +127 @@
         this.smtp.key = identityData.smtp.key;
         this.sideDescription = identityData.sideDescription;
-        this.extras.copy(identityData.extras);
+        if (this.extras) this.extras.copy(identityData.extras);
     },
 
@@ -125 +136 @@
 
         var ignoreFullNameMatchKey = null;
-
-        var accounts = queryISupportsArray(gAccountManager.accounts, Components.interfaces.nsIMsgAccount);
-        for (var i in accounts) {
-            // skip possible active VirtualIdentity Accounts
-            try { vI.account._prefroot.getBoolPref("mail.account."+accounts[i].key+".vIdentity"); continue; } catch (e) { };
-    
-            var identities = queryISupportsArray(accounts[i].identities, Components.interfaces.nsIMsgIdentity);
-            for (var j in identities) {
-//              vI.notificationBar.dump("## identityData comp: fullName.toLowerCase()='" + identities[j].fullName.toLowerCase() + "' email.toLowerCase()='" + identities[j].email.toLowerCase() + "' smtp='" + identities[j].smtpServerKey + "'\n");
+        var AccountManager = Components.classes["@mozilla.org/messenger/account-manager;1"]
+            .getService(Components.interfaces.nsIMsgAccountManager);
+        for (let i = 0; i < AccountManager.accounts.Count(); i++) {
+            var account = AccountManager.accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount);
+            try { this._prefroot.getBoolPref("mail.account."+account.key+".vIdentity"); continue; } catch (e) { };
+            for (let j = 0; j < account.identities.Count(); j++) {
+                var identity = account.identities.QueryElementAt(j, Components.interfaces.nsIMsgIdentity);
+//              vI.notificationBar.dump("## identityData comp: fullName.toLowerCase()='" + identity.fullName.toLowerCase() + "' email.toLowerCase()='" + identity.email.toLowerCase() + "' smtp='" + identity.smtpServerKey + "'\n");
                 var email = this.email?this.email:"";               // might be null if no identity is set
-                var idEmail = identities[j].email?identities[j].email:"";   // might be null if no identity is set
+                var idEmail = identity.email?identity.email:""; // might be null if no identity is set
                 if (    (email.toLowerCase() == idEmail.toLowerCase()) &&
-                    this.smtp.equal(new smtpObj(identities[j].smtpServerKey))   ) {
+                    this.smtp.equal(new smtpObj(identity.smtpServerKey))    ) {
                         // if fullName matches, than this is a final match
-                        if ( this.fullName.toLowerCase() == identities[j].fullName.toLowerCase() ) {
-                            vI.notificationBar.dump("## identityData: isExistingIdentity: " + this.combinedName + " found, id='" + identities[j].key + "'\n");
-                            return identities[j].key; // return key and stop searching
+                        if ( this.fullName.toLowerCase() == identity.fullName.toLowerCase() ) {
+                            vI.notificationBar.dump("## identityData: isExistingIdentity: " + this.combinedName + " found, id='" + identity.key + "'\n");
+                            return identity.key; // return key and stop searching
                         }
                         // if fullNames don't match, remember the key but continue to search for full match
-                        else if (!ignoreFullNameMatchKey) ignoreFullNameMatchKey = identities[j].key;
+                        else if (!ignoreFullNameMatchKey) ignoreFullNameMatchKey = identity.key;
                 }
             }
@@ -168 +178 @@
 
         this.comp.equals.id = this.id.equal(compareIdentityData.id);
-        this.comp.equals.extras = this.extras.equal(compareIdentityData.extras);
+        this.comp.equals.extras = this.extras?this.extras.equal(compareIdentityData.extras):true;
         
         return (this.comp.equals.fullName && this.comp.equals.email && this.comp.equals.smtp && this.comp.equals.id && this.comp.equals.extras);
     },
 
-    equalsCurrentIdentity : function(getCompareMatrix) {
-        var equal = this.equals(document.getElementById("msgIdentity_clone").identityData);
+    equalsIdentity : function(compareIdentityData, getCompareMatrix) {
+        var equal = this.equals(compareIdentityData);
         var compareMatrix = null;
         // generate CompareMatrix only if asked and non-equal
@@ -184 +194 @@
         const Items = Array("fullName", "email", "smtp", "id");
         var string = "";        
-        var saveBaseId = (vI.statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true")
-        var saveSMTP = (vI.statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true")
+        var saveBaseId = (!vI.statusmenu && this._pref.getBoolPref("storage_store_base_id")
+                || vI.statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true")
+        var saveSMTP = (!vI.statusmenu && this._pref.getBoolPref("storage_store_SMTP")
+                || vI.statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true")
         for each (let item in Items) {
             var classEqual = (this.comp.equals[item])?"equal":"unequal";
@@ -195 +207 @@
                 "</tr>"
         }
-        string += this.extras.getCompareMatrix();
+        string += this.extras?this.extras.getCompareMatrix():"";
         return string;
     },
@@ -205 +217 @@
             string += "<tr><td class='col1'>" + this[item+"Label"] + ":</td>" +
                 "<td class='col2'>" + this[item+"Html"] + "</td></tr>"
-        string += this.extras.getMatrix();
+        string += this.extras?this.extras.getMatrix():"";
         return string;      
     }
@@ -233 +245 @@
 
     addWithoutDuplicates : function(identityData) {
+        if (!identityData) return;
         for (var index = 0; index < this.number; index++) {
             if (this.identityDataCollection[index].email == identityData.email &&
@@ -274 +287 @@
 function smtpObj(key) {
     this._key = key;
-    this.DEFAULT_TAG = document.getElementById("bundle_messenger").getString("defaultServerTag");
+    this.DEFAULT_TAG =  Components.classes["@mozilla.org/intl/stringbundle;1"]
+                        .getService(Components.interfaces.nsIStringBundleService)
+                        .createBundle("chrome://messenger/locale/messenger.properties").
+                            GetStringFromName("defaultServerTag");
 }
 smtpObj.prototype = {

chrome/content/v_identity/vI_msgIdentityCloneTools.js

@@ -24 +24 @@
 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
 var msgIdentityCloneTools = {   
+    _pref : Components.classes["@mozilla.org/preferences-service;1"]
+        .getService(Components.interfaces.nsIPrefService)
+        .getBranch("extensions.virtualIdentity."),
+
     copySelectedIdentity : function(id_key) {
         vI.notificationBar.dump("## msgIdentityCloneTools: copySelectedIdentity\n");
@@ -46 +50 @@
             vI.notificationBar.dump("## msgIdentityCloneTools: signatureSwitch hide/remove signatures\n");
             // code to hide the text signature
-            try { if (vI.main.preferences.getBoolPref("hide_signature") && ss_signature.length == 0) {
+            try { if (msgIdentityCloneTools._pref.getBoolPref("hide_signature") && ss_signature.length == 0) {
                 vI.notificationBar.dump("## msgIdentityCloneTools: hide text/html signature");
                 ss_main.signatureSwitch()
@@ -52 +56 @@
             } } catch(vErr) { vI.notificationBar.dump(" -- missing signatureSwitch extension?\n"); };
             // code to hide the sMime signature
-            try { if (vI.main.preferences.getBoolPref("hide_sMime_messageSignature")) {
+            try { if (msgIdentityCloneTools._pref.getBoolPref("hide_sMime_messageSignature")) {
                 var element = document.getElementById("menu_securitySign1");
                 if (element.getAttribute("checked") == "true") {
@@ -62 +66 @@
             } catch(vErr) { };
             // code to hide the openGPG signature
-            try { if (vI.main.preferences.getBoolPref("hide_openPGP_messageSignature")) {
+            try { if (msgIdentityCloneTools._pref.getBoolPref("hide_openPGP_messageSignature")) {
                 var element = document.getElementById("enigmail_signed_send");
                 if (element.getAttribute("checked") == "true") {

chrome/content/v_identity/vI_prefDialog.js

@@ -42 +42 @@
         var panelIndex = (tabpanel)?tabpanel:document.getElementById('prefTabbox').selectedIndex
         var prefTree = document.getElementById('prefTabbox').selectedPanel.getElementsByAttribute("class", "vIprefTree")[0];
-        var currentVersion = document.getElementById("extVersion").getAttribute("value").split(/\./);
+        var currentVersion = document.getElementById("virtualIdentityExtension_extVersion").getAttribute("value").split(/\./);
         var extVersion = currentVersion[0] + "." + currentVersion[1];
         var url = "https://www.absorb.it/virtual-id/wiki/docs/" + extVersion + "/tab" + panelIndex + "/tree" + prefTree.currentIndex;

chrome/content/v_identity/vI_prefDialog.xul

@@ -739 +739 @@
 </tabbox>
 <browserbox id="vI_remoteBrowserBox" class="vI_remoteBrowserBox" localCss="localDoc.css" flex="1" hidden="true" type="content" />
-<label id="extVersion" value="&vident.version;" hidden="true" />
+<label id="virtualIdentityExtension_extVersion" value="&vident.version;" hidden="true" />
 </hbox>
 <!--

chrome/content/v_identity/vI_rdfDatasource.js

@@ -29 +29 @@
     if (this._rdfFileName) this.init();
     if (!dontRegisterObserver) this.AccountManagerObserver.register();
+    let window = Components.classes['@mozilla.org/appshell/window-mediator;1']
+        .getService(Components.interfaces.nsIWindowMediator)
+        .getMostRecentWindow("mail:3pane");
+    this._extVersion = window.virtualIdentityExtension.extensionVersion;
 }
 
 rdfDatasource.prototype = {
+    _extVersion :       null,
     _rdfVersion :       "0.0.5",
     _rdfService :       Components.classes["@mozilla.org/rdf/rdf-service;1"]
@@ -67 +72 @@
             .createInstance(Components.interfaces.nsIRDFContainer),
     
+    _pref : Components.classes["@mozilla.org/preferences-service;1"]
+        .getService(Components.interfaces.nsIPrefService)
+        .getBranch("extensions.virtualIdentity."),
+
     getContainer : function (type) {
         switch (type) {
@@ -153 +162 @@
         var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
             .getService(Components.interfaces.nsIVersionComparator);
-        // seamonkey doesn't have a extensionmanager, so read version of extension from hidden version-label
-        // var extVersion = this.extensionManager.getItemForID(this._virtualIdentityID).version
-        var extVersion = document.getElementById("extVersion").getAttribute("value");
-        return (!oldExtVersion || versionChecker.compare(oldExtVersion, extVersion) < 0)    
+        return (!oldExtVersion || versionChecker.compare(oldExtVersion, this._extVersion) < 0)  
     },
     // **************    RDF UPGRADE CODE    ****************************************************
@@ -315 +321 @@
     
     storeExtVersion: function() {
-        // seamonkey doesn't have a extensionmanager, so read version of extension from hidden version-label
-        // var extVersion = this.extensionManager.getItemForID(this._virtualIdentityID).version
-        var extVersion = document.getElementById("extVersion").getAttribute("value");
         this._setRDFValue(
-            this._rdfService.GetResource(this._rdfNS + "virtualIdentity"), "version", extVersion)
+            this._rdfService.GetResource(this._rdfNS + "virtualIdentity"), "version", this._extVersion)
         this._flush();
     },
@@ -584 +587 @@
         this._unsetRDFValue(resource, "name", this._getRDFValue(resource, "name"))
         
-        var extras = new vI.storageExtras(this, resource);
-        extras.loopForRDF(this, resource, "unset");
+        var extras = (typeof(vI.storageExtras)=='function')?new vI.storageExtras(this, resource):null;
+        if (extras) extras.loopForRDF(this, resource, "unset");
         this.getContainer(recType).RemoveElement(resource, true);
     },
@@ -614 +617 @@
             var smtp = this._getRDFValue(resource, "smtp")
             if (!smtp) smtp = vI.NO_SMTP_TAG;
-            var extras = new vI.storageExtras(this, resource);
+            var extras = (typeof(vI.storageExtras)=='function')?new vI.storageExtras(this, resource):null;
             
             var localIdentityData = new vI.identityData(email, fullName, id, smtp, extras)
@@ -621 +624 @@
     },
     
-    findMatchingFilter : function (recDescription) {
+    __getDescriptionAndType : function (recipient, recipientType) {
+        if (recipientType == "addr_newsgroups") return { recDesc : recipient, recType : "newsgroup" }
+        else if (this.__isMailingList(recipient)) {
+            vI.notificationBar.dump("## __getDescriptionAndType: '" + recipient + "' is MailList\n");
+            return { recDesc : this.__getMailListName(recipient), recType : "maillist" }
+        }
+        else {
+            vI.notificationBar.dump("## __getDescriptionAndType: '" + recipient + "' is no MailList\n");
+            var localIdentityData = new vI.identityData(recipient, null, null, null, null, null, null);
+            return { recDesc : localIdentityData.combinedName, recType : "email" }
+        }
+    },
+    
+    // --------------------------------------------------------------------
+    // check if recipient is a mailing list.
+    // Similiar to Thunderbird, if there are muliple cards with the same displayName the mailinglist is preferred
+    // see also https://bugzilla.mozilla.org/show_bug.cgi?id=408575
+    __isMailingList: function(recipient) {
+        let abManager = Components.classes["@mozilla.org/abmanager;1"]
+            .getService(Components.interfaces.nsIAbManager);
+        let allAddressBooks = abManager.directories;
+        while (allAddressBooks.hasMoreElements()) {
+            let ab = allAddressBooks.getNext();
+            if (ab instanceof Components.interfaces.nsIAbDirectory && !ab.isRemote) {
+                let abdirectory = abManager.getDirectory(ab.URI + 
+                    "?(and(DisplayName,=," + encodeURIComponent(this.__getMailListName(recipient)) + ")(IsMailList,=,TRUE))");
+                if (abdirectory) {
+                    try {   // just try, sometimes there are no childCards at all...
+                        let cards = abdirectory.childCards;
+                        if (cards.hasMoreElements()) return true;   // only interested if there is at least one element...
+                    } catch(e) { }
+                }
+            }
+        }
+        return false;
+    },  
+    
+    // --------------------------------------------------------------------
+    
+    __getMailListName : function(recipient) {
+        if (recipient.match(/<[^>]*>/) || recipient.match(/$/)) {
+            var mailListName = RegExp.leftContext + RegExp.rightContext
+            mailListName = mailListName.replace(/^\s+|\s+$/g,"")
+        }
+        return mailListName;
+    },
+
+    findMatchingFilter : function (recipient, recipientType) {
+        var recDescription = this.__getDescriptionAndType(recipient, recipientType).recDesc;
         if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: findMatchingFilter for " + recDescription + ".\n");
         var enumerator = this._filterContainer.GetElements();
@@ -660 +711 @@
     },
     
-    readVIdentityFromRDF : function (recDescription, recType) {
+    readVIdentityFromRDF : function (recipient, recipientType) {
+        var storedRecipient = this.__getDescriptionAndType(recipient, recipientType);
         var email = this._rdfService.GetResource(this._rdfNS + "rdf#email");
-        var resource = this._getRDFResourceForVIdentity(recDescription, recType);
+        var resource = this._getRDFResourceForVIdentity(storedRecipient.recDesc, storedRecipient.recType);
         if (!resource) return null;
         if (!this._rdfDataSource.hasArcOut(resource, email)) {
@@ -684 +736 @@
             "' fullName='" + fullName + "' id='" + id + "' smtp='" + smtp + "'\n");
         
-        var extras = new vI.storageExtras(this, resource);
-        if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: extras:" + extras.status() + "\n");
+        var extras = (typeof(vI.storageExtras)=='function')?new vI.storageExtras(this, resource):null;
+        var extras_status = (typeof(vI.storageExtras)=='function')?extras.status():" not used";
+        if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: extras:" + extras_status + "\n");
         
         var localIdentityData = new vI.identityData(email, fullName, id, smtp, extras)
@@ -699 +752 @@
     },
     
-    updateRDFFromVIdentity : function(recDescription, recType) {
-        this.updateRDF(recDescription, recType,
-            document.getElementById("msgIdentity_clone").identityData,
-            (vI.statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true"),
-            (vI.statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true"),
+    updateRDFFromVIdentity : function(identityData, recipientName, recipientType) {
+        var recipient = this.__getDescriptionAndType(recipientName, recipientType)
+        this.updateRDF(recipient.recDesc, recipient.recType, identityData,
+            (!vI.statusmenu && this._pref.getBoolPref("storage_store_base_id")
+                || vI.statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true"),
+            (!vI.statusmenu && this._pref.getBoolPref("storage_store_SMTP")
+                || vI.statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true"),
             null, null);
     },
@@ -745 +800 @@
         this._setRDFValue(resource, "name", recDescription);
  
-        localIdentityData.extras.loopForRDF(this, resource, "set");
+        if (localIdentityData.extras) localIdentityData.extras.loopForRDF(this, resource, "set");
         
         if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: updateRDF add " + resource.ValueUTF8 + " at position " + position + ".\n");
@@ -765 +820 @@
         return value;
     },
-    
-    //  code adapted from http://xulsolutions.blogspot.com/2006/07/creating-uninstall-script-for.html
+
+    //  code adapted from http://xulsolutions.blogspot.com/2006/07/creating-uninstall-script-for.html
     AccountManagerObserver : {
         _uninstall : false,
@@ -795 +850 @@
 }
 
+
+function rdfDatasourceAccess() {
+    this._rdfDataSource = new rdfDatasource("virtualIdentity.rdf", false);
+    this.stringBundle = Services.strings.createBundle("chrome://v_identity/locale/v_identity.properties");
+}
+
+rdfDatasourceAccess.prototype = {
+    _rdfDataSource : null,
+    stringBundle : null,
+    
+    _pref : Components.classes["@mozilla.org/preferences-service;1"]
+        .getService(Components.interfaces.nsIPrefService)
+        .getBranch("extensions.virtualIdentity."),
+    
+    clean : function() {
+        this._rdfDataSource.clean();
+    },
+    
+    updateVIdentityFromStorage : function(recipientName, recipientType, currentIdentity, currentIdentityIsVid, isNotFirstInputElement) {
+        var localIdentities = new vI.identityCollection();
+        localIdentities.addWithoutDuplicates(this._rdfDataSource.readVIdentityFromRDF(recipientName, recipientType));
+        if (localIdentities.number == 1) vI.notificationBar.dump("## rdfDatasourceAccess: using data from direct match\n");
+        localIdentities.addWithoutDuplicates(this._rdfDataSource.findMatchingFilter(recipientName, recipientType));
+        
+        var returnValue = {}; returnValue.identityCollection = localIdentities;
+        if (localIdentities.number == 0) {
+            vI.notificationBar.dump("## rdfDatasourceAccess: updateVIdentityFromStorage no usable Storage-Data found.\n");
+        }
+        else {
+            vI.notificationBar.dump("## rdfDatasourceAccess: compare with current Identity\n");
+            if (this._pref.getBoolPref("storage_getOneOnly") &&     // if requested to retrieve only storageID for first recipient entered
+                isNotFirstInputElement &&                           // and it is now not the first recipient entered
+                !localIdentities.identityDataCollection[0].equalsIdentity(currentIdentity, false).equal) {      // and this id is different than the current used one
+                    vI.notificationBar.setNote(
+                        this.stringBundle.GetStringFromName("vident.smartIdentity.vIStorageCollidingIdentity"), // than drop the potential changes
+                        "storage_notification");
+                    returnValue.result = "drop";
+            }
+            // only update fields if new Identity is different than old one.
+            else {
+                vI.notificationBar.dump("## rdfDatasourceAccess: updateVIdentityFromStorage check if storage-data matches current Identity.\n");
+                var compResult = localIdentities.identityDataCollection[0].equalsIdentity(currentIdentity, true);
+                if (!compResult.equal) {
+                    var warning = this.__getWarning("replaceVIdentity", recipientName, compResult.compareMatrix);
+                    if (    !currentIdentityIsVid ||
+                        !this._pref.getBoolPref("storage_warn_vI_replace") ||
+                        (this.__askWarning(warning) == "accept")) {
+                            returnValue.result = "accept";
+                    }
+                }
+                else {
+                    returnValue.result = "equal";
+                }
+            }
+        }
+        return returnValue;
+    },
+    
+    storeVIdentityToAllRecipients : function(identityData, recipients) {
+        var multipleRecipients = (recipients.length > 1);
+        var dontUpdateMultipleNoEqual = (this._pref.getBoolPref("storage_dont_update_multiple") && multipleRecipients)
+        vI.notificationBar.dump("## rdfDatasource: storeVIdentityToAllRecipients dontUpdateMultipleNoEqual='" + dontUpdateMultipleNoEqual + "'\n")
+        
+        for (var j = 0; j < recipients.length; j++) {
+            var returnValue = this.__updateStorageFromVIdentity(identityData, recipients[j].recipient, recipients[j].recipientType, dontUpdateMultipleNoEqual);
+            if (returnValue.update != "accept")  break;
+        }
+        return returnValue;
+    },
+
+    getVIdentityFromAllRecipients : function(allIdentities, recipients) {
+        var initnumber = allIdentities.number;
+        for (var j = 0; j < recipients.length; j++) {
+            allIdentities.addWithoutDuplicates(this._rdfDataSource.readVIdentityFromRDF(recipients[j].recipient, recipients[j].recipientType));
+            allIdentities.addWithoutDuplicates(this._rdfDataSource.findMatchingFilter(recipients[j].recipient, recipients[j].recipientType));
+        }
+        vI.notificationBar.dump("## storage: found " + (allIdentities.number-initnumber) + " address(es)\n")
+    },
+
+    __updateStorageFromVIdentity : function(identityData, recipient, recipientType, dontUpdateMultipleNoEqual) {
+        vI.notificationBar.dump("## rdfDatasource: __updateStorageFromVIdentity.\n")
+        var storageDataByType = this._rdfDataSource.readVIdentityFromRDF(recipient, recipientType);
+        var storageDataByFilter = this._rdfDataSource.findMatchingFilter(recipient, recipientType);
+        
+        // update (storing) of data by type is required if there is
+        // no data stored by type (or different data stored) and no equal filter found
+        var storageDataByTypeCompResult = storageDataByType?storageDataByType.equalsIdentity(identityData, true):null;
+        var storageDataByTypeEqual = (storageDataByType && storageDataByTypeCompResult.equal);
+        var storageDataByFilterEqual = (storageDataByFilter && storageDataByFilter.equalsIdentity(identityData, false).equal);
+        
+        var doUpdate = "accept";
+        if (    (!storageDataByType && !storageDataByFilterEqual) ||
+            (!storageDataByTypeEqual && !storageDataByFilterEqual && !dontUpdateMultipleNoEqual) ) {
+            vI.notificationBar.dump("## storage: __updateStorageFromVIdentity updating\n")
+            if (storageDataByType && !storageDataByTypeEqual && this._pref.getBoolPref("storage_warn_update")) {
+                vI.notificationBar.dump("## storage: __updateStorageFromVIdentity overwrite warning\n");
+                doUpdate = this.__askWarning(this.__getWarning("updateStorage", recipient, storageDataByTypeCompResult.compareMatrix));
+            }
+        }
+        if (doUpdate == "accept") this._rdfDataSource.updateRDFFromVIdentity(identityData, recipient, recipientType);
+        return { update : doUpdate, storedIdentity : storageDataByType };
+    },
+    
+    __getWarning : function(warningCase, recipient, compareMatrix) {
+        var warning = { title: null, recLabel : null, recipient : null, warning : null, css: null, query : null, class : null };
+        warning.title = this.stringBundle.GetStringFromName("vident." + warningCase + ".title")
+        warning.recLabel = this.stringBundle.GetStringFromName("vident." + warningCase + ".recipient") + ":";
+        warning.recipient = recipient;
+        warning.warning = 
+            "<table class='" + warningCase + "'><thead><tr><th class='col1'/>" +
+                "<th class='col2'>" + this.stringBundle.GetStringFromName("vident." + warningCase + ".currentIdentity") + "</th>" +
+                "<th class='col3'>" + this.stringBundle.GetStringFromName("vident." + warningCase + ".storedIdentity") + "</th>" +
+            "</tr></thead>" +
+            "<tbody>" + compareMatrix + "</tbody>" +
+            "</table>"
+        warning.css = "vI.DialogBrowser.css";
+        warning.query = this.stringBundle.GetStringFromName("vident." + warningCase + ".query");
+        warning.class = warningCase;
+        return warning;
+    },
+
+    __askWarning : function(warning) {
+        var retVar = { returnValue: null };
+        var answer = window.openDialog("chrome://v_identity/content/vI_Dialog.xul","",
+                    "chrome, dialog, modal, alwaysRaised, resizable=yes",
+                     warning, retVar)
+        dump("retVar.returnValue=" + retVar.returnValue + "\n")
+        return retVar.returnValue;
+    },
+}
+
+
 // create with name of the file to import into
 function rdfDatasourceImporter(rdfFileName) {
@@ -949 +1136 @@
                     var smtp = this._rdfImportDataSource._getRDFValue(resource, "smtp")
                     smtp = (smtp && smtp != vI.DEFAULT_SMTP_TAG)?relevantSMTPs[smtp].smtp:smtp
-                    var extras = new vI.storageExtras(this._rdfImportDataSource, resource);
+                    var extras = (typeof(vI.storageExtras)=='function')?new vI.storageExtras(this._rdfImportDataSource, resource):null;
                     var localIdentityData = new vI.identityData(email, fullName, id, smtp, extras)
                     
@@ -980 +1167 @@
 }
 vI.rdfDatasource = rdfDatasource;
+vI.rdfDatasourceAccess = rdfDatasourceAccess;
 vI.rdfDatasourceImporter = rdfDatasourceImporter;
 }});

chrome/content/v_identity/vI_smartIdentity.js

@@ -24 +24 @@
 
 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
-var smartIdentity = {
+
+    
+function smartIdentityCollection(msgHdr, preseletedID, currentIDisVID, newsgroup, recipients) {
+    this._IDisVID = currentIDisVID;
+    this._preselectedID = preseletedID;
+    this._msgHdr = msgHdr;
+    this._newsgroup = newsgroup;
+    this._unicodeConverter.charset = "UTF-8";
+    this._recipients = recipients;
+    this._rdfDatasourceAccess = new vI.rdfDatasourceAccess();
+    this._allIdentities = new vI.identityCollection();
+};
+
+smartIdentityCollection.prototype = {
     messenger : Components.classes["@mozilla.org/messenger;1"].createInstance()
         .QueryInterface(Components.interfaces.nsIMessenger),
-        
-    smartIdentity_BaseIdentity : null,
-
-    clean : function() {
-        smartIdentity.smartIdentity_BaseIdentity = null;
-    },
-    
-    // After Loading the MessageComposeDialog, check if smartIdentity is needed
-    init : function() {
-        var type = gMsgCompose.type;
-        var msgComposeType = Components.interfaces.nsIMsgCompType;
-        vI.notificationBar.dump("## smartIdentity: msgComposeType = " + type + "\n");
-        
-        switch (type) {
-            case msgComposeType.ForwardAsAttachment:
-            case msgComposeType.ForwardInline:
-            case msgComposeType.Reply:
-            case msgComposeType.ReplyAll:
-            case msgComposeType.ReplyToGroup: // reply to a newsgroup, would possibly be stopped later
-            case msgComposeType.ReplyToSender:
-            case msgComposeType.ReplyToSenderAndGroup: // reply to a newsgroup, would possibly be stopped later
-            case msgComposeType.ReplyWithTemplate:
-            case msgComposeType.ReplyToList:
-                smartIdentity.Reply(); break;
-            case msgComposeType.Draft:
-            case msgComposeType.Template:
-                smartIdentity.Draft(); break;
-            case msgComposeType.New:
-            case msgComposeType.NewsPost:
-            case msgComposeType.MailToUrl:
-                smartIdentity.NewMail(); break;
-            }
-    },
-        
+    _pref : Components.classes["@mozilla.org/preferences-service;1"]
+            .getService(Components.interfaces.nsIPrefService)
+            .getBranch("extensions.virtualIdentity."),
+    _unicodeConverter : Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]
+            .createInstance(Components.interfaces.nsIScriptableUnicodeConverter),
+    _headerParser : Components.classes["@mozilla.org/messenger/headerparser;1"]
+            .getService(Components.interfaces.nsIMsgHeaderParser),
+
+    _msgComposeTypeReference : Components.interfaces.nsIMsgCompType,
+    
+    _IDisVID : false,
+    _preselectedID : null,
+    _allIdentities : null,
+    _selectedValue : null,
+    _newsgroup : null,
+    _rdfDatasourceAccess : null,
+
     // this function adds a timestamp to the current sender
     __autoTimestamp : function() {
-        vI.notificationBar.dump("## smartIdentity: __autoTimestamp()\n");
-        if (document.getElementById("msgIdentity_clone").vid) {
-            vI.notificationBar.dump("## smartIdentity: Virtual Identity in use, aborting\n");
+        if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: __autoTimestamp()\n");
+        if (this._IDisVID) {
+            if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: Virtual Identity in use, aborting\n");
             return;
         }
 
-        var current_email = getCurrentIdentity().email.split("@");
+        var current_email = this._preselectedID.email.split("@");
         var localpart = current_email[0];
         var domain = current_email[1];
         
-        vI.notificationBar.dump("## smartIdentity: current email: " + current_email[0] + "@" + current_email[1] + "\n");
-        
-        var autoString = vI.main.preferences.getCharPref("autoString");
-        var formatString = vI.main.preferences.getCharPref("autoTimeFormat");
+        if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: current email: " + current_email[0] + "@" + current_email[1] + "\n");
+        
+        var autoString = this._pref.getCharPref("autoString");
+        var formatString = this._pref.getCharPref("autoTimeFormat");
         
         var dateObj = new Date(); var dateString = "";
@@ -85 +81 @@
         
         var new_email = autoString.replace(/%l/g, localpart).replace(/%d/g, domain).replace(/%t/g,dateString);
-        vI.notificationBar.dump("## smartIdentity: new email: " + new_email + "\n");
-
-        vI.notificationBar.setNote(vI.main.elements.strings.getString("vident.smartIdentity.vIUsage") + ".",
-                    "smart_reply_notification");
-
-        document.getElementById("msgIdentity_clone").email = new_email;
+        if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: new email: " + new_email + "\n");
+
+        var newIdentity = new vI.identityData(new_email,
+            this._preselectedID.fullName, this._preselectedID.key, this._preselectedID.smtpServerKey, null, null)
+
+        this._allIdentities.addWithoutDuplicates(newIdentity);
+        this._selectedValue = 0;
     },
     
     __ignoreID : function() {
-        vI.notificationBar.dump("## smartIdentity: checking " + vI.main.preferences.getCharPref("idSelection_ignoreIDs") + " against " + vI.main.elements.Obj_MsgIdentity.value + "\n")
+        if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: checking " + this._pref.getCharPref("idSelection_ignoreIDs") + " against " + this._preselectedID.key + "\n")
         // check if usage if virtual Identities should be used at all for the currently selected ID
-        if (vI.main.preferences.getCharPref("idSelection_ignoreIDs").indexOf(":" + vI.main.elements.Obj_MsgIdentity.value + ":") != -1) {
-            vI.notificationBar.dump("## smartIdentity: not using virtual Identites for ID " + vI.main.elements.Obj_MsgIdentity.value + "\n");
+        if (this._pref.getCharPref("idSelection_ignoreIDs").indexOf(":" + this._preselectedID.key + ":") != -1) {
+            if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: not using virtual Identites for ID " + this._preselectedID.key + "\n");
             return true;
         }
@@ -104 +101 @@
     
     NewMail : function() {
-        if (smartIdentity.__ignoreID()) return;
-        
-        var storageIdentities = new vI.identityCollection();
-        vI.storage.getVIdentityFromAllRecipients(storageIdentities);
-        
-        if (storageIdentities.number > 0) smartIdentity.__smartIdentitySelection(storageIdentities, false)
-        else if (vI.main.preferences.getBoolPref("autoTimestamp")) smartIdentity.__autoTimestamp(); 
-    },
-    
-    ReplyOnSent : function(hdr) {
-        vI.notificationBar.dump("## smartIdentity: ReplyOnSent() (rules like SmartDraft)\n");
-        
-        var allIdentities = new vI.identityCollection();
-
-        smartIdentity.__SmartDraftOrReplyOnSent(hdr, allIdentities);
-        var storageIdentities = new vI.identityCollection();
-        vI.storage.getVIdentityFromAllRecipients(storageIdentities);
-        
-        allIdentities.mergeWithoutDuplicates(storageIdentities);
-            
-        if (allIdentities.number > 0) smartIdentity.__smartIdentitySelection(allIdentities, true);
-
+        if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: NewMail()\n");
+        if (this.__ignoreID()) return;
+        this._rdfDatasourceAccess.getVIdentityFromAllRecipients(this._allIdentities, this._recipients);
+        if (this._allIdentities.number == 0 && this._pref.getBoolPref("autoTimestamp")) this.__autoTimestamp();
+    },
+    
+    _foundExistingIdentity : function() {
+        /* compare with existing Identities                                     */
+        for (var index = 0; index < this._allIdentities.number; index++) {
+            var existingID = this._allIdentities.identityDataCollection[index].isExistingIdentity(false);
+            if (existingID) {
+                this._allIdentities.identityDataCollection[index].id.key = existingID;  // set found identity
+                // reorder list of Identities to prefer it on autoselect
+                // has to be done before Identities are added to the Menu
+                if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: found existing Identity, reorder to prefer this one.\n");
+                var firstIdentity = this._allIdentities.identityDataCollection[index];
+                for (var i = index; index > 0; index--) {
+                    this._allIdentities.identityDataCollection[index] = this._allIdentities.identityDataCollection[index-1];
+                }
+                this._allIdentities.identityDataCollection[0] = firstIdentity;
+                return { key: index };
+            }
+        }
+        return null;
+    },
+    
+    ReplyOnSent : function() {
+        if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: ReplyOnSent() (rules like SmartDraft)\n");
+        this.__SmartDraftOrReplyOnSent();
+        this._rdfDatasourceAccess.getVIdentityFromAllRecipients(this._allIdentities, this._recipients);
     },
 
     Draft : function() {
-        vI.notificationBar.dump("## smartIdentity: Draft()\n");
-        
-        var allIdentities = new vI.identityCollection();
-
-        var draftHdr = smartIdentity.messenger.
-            messageServiceFromURI(gMsgCompose.originalMsgURI).messageURIToMsgHdr(gMsgCompose.originalMsgURI);
-        // fails with seamonkey 1.1.11, so just try to read to draft id
-        try { draftHdr = smartIdentity.messenger.
-            messageServiceFromURI(gMsgCompose.compFields.draftId).messageURIToMsgHdr(gMsgCompose.compFields.draftId);
-        } catch (ex) { };
-
-        smartIdentity.__SmartDraftOrReplyOnSent(draftHdr, allIdentities);
-        var storageIdentities = new vI.identityCollection();
-        vI.storage.getVIdentityFromAllRecipients(storageIdentities);
-        
-        allIdentities.mergeWithoutDuplicates(storageIdentities);
-            
-        if (allIdentities.number > 0) smartIdentity.__smartIdentitySelection(allIdentities, true);
-    },
-    
-    __parseHeadersWithArray: function(hdr, allIdentities) {
+        if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: Draft()\n");
+        
+        this.__SmartDraftOrReplyOnSent();
+        this._rdfDatasourceAccess.getVIdentityFromAllRecipients(this._allIdentities, this._recipients);
+    },
+    
+    __parseHeadersWithArray: function(header, identityCollection) {
         var emails = {}; var fullNames = {}; var combinedNames = {};
-        var number = vI.main.headerParser.parseHeadersWithArray(hdr, emails, fullNames, combinedNames);
+        var number = this._headerParser.parseHeadersWithArray(header, emails, fullNames, combinedNames);
         for (var index = 0; index < number; index++) {
             var newIdentity = new vI.identityData(emails.value[index], fullNames.value[index],
                 null, vI.NO_SMTP_TAG, null, null);
-            allIdentities.addWithoutDuplicates(newIdentity);
+            identityCollection.addWithoutDuplicates(newIdentity);
         }
     },
 
     // this function checks if we have a draft-case and Smart-Draft should replace the Identity
-    __SmartDraftOrReplyOnSent : function(hdr, allIdentities) {
-        if (!vI.main.preferences.getBoolPref("smart_draft"))
-            { vI.notificationBar.dump("## smartIdentity: SmartDraft deactivated\n"); return; }
-
-        vI.notificationBar.dump("## smartIdentity: __SmartDraftOrReplyOnSent()\n");
-
-        if (hdr) {
-            smartIdentity.__parseHeadersWithArray(hdr.author, allIdentities)
-            vI.notificationBar.dump("## smartIdentity: sender '" + allIdentities.identityDataCollection[0].combinedName + "'\n");
-        }
-        else vI.notificationBar.dump("## smartIdentity: __SmartDraftOrReplyOnSent: No Header found, shouldn't happen\n");
-    },
-    
-    __filterAddresses : function(smartIdentities) {
+    __SmartDraftOrReplyOnSent : function() {
+        if (!this._pref.getBoolPref("smart_draft"))
+            { if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: SmartDraft deactivated\n"); return; }
+
+        if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: __SmartDraftOrReplyOnSent()\n");
+
+        if (this._msgHdr) {
+            this.__parseHeadersWithArray(this._msgHdr.author, this._allIdentities)
+            if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: sender '" + this._allIdentities.identityDataCollection[0].combinedName + "'\n");
+        }
+        else if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: __SmartDraftOrReplyOnSent: No Header found, shouldn't happen\n");
+    },
+    
+    __filterAddresses : function() {
         var returnIdentities = new vI.identityCollection();
         
         var filterList  =
-            vI.main.unicodeConverter.ConvertToUnicode(vI.main.preferences.getCharPref("smart_reply_filter")).split(/\n/)
+            this._unicodeConverter.ConvertToUnicode(this._pref.getCharPref("smart_reply_filter")).split(/\n/)
         if (filterList.length == 0) filterList[0] == ""
         
@@ -184 +175 @@
             var recentfilterType; var skipRegExp = false;
             if (filterList.length <= 1 && filterList[0] == "")
-                { vI.notificationBar.dump("## smartIdentity: no filters configured\n"); recentfilterType = filterType.None; }
+                { if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: no filters configured\n"); recentfilterType = filterType.None; }
             else if (/^[+-]?\/(.*)\/$/.exec(filterList[i]))
-                { vI.notificationBar.dump("## smartIdentity: filter emails with RegExp '"
+                { if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: filter emails with RegExp '"
                     + filterList[i].replace(/\\/g,"\\\\") + "'\n"); recentfilterType = filterType.RegExp; }
-            else    { vI.notificationBar.dump("## smartIdentity: filter emails, compare with '"
+            else    { if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: filter emails, compare with '"
                     + filterList[i] + "'\n"); recentfilterType = filterType.StrCmp; }
-            for (var j = 0; j < smartIdentities.number; j++) { // check if recent email-address (pre-choosen identity) is found in 
+            for (var j = 0; j < this._allIdentities.number; j++) { // check if recent email-address (pre-choosen identity) is found in 
             // copied and adapted from correctIdentity, thank you for the RegExp-idea!
                 var add_addr = false;
@@ -200 +191 @@
                         try {   /^[+-]?\/(.*)\/$/.exec(filterList[i]);
                             if ( filterList[i][0] == "-" ) {
-                                if (smartIdentities.identityDataCollection[j].email.match(new RegExp(RegExp.$1,"i")))
-                                    smartIdentities.dropIdentity(j--);
+                                if (this._allIdentities.identityDataCollection[j].email.match(new RegExp(RegExp.$1,"i")))
+                                    this._allIdentities.dropIdentity(j--);
                             } else
-                                add_addr = (smartIdentities.identityDataCollection[j].email.match(new RegExp(RegExp.$1,"i")));
+                                add_addr = (this._allIdentities.identityDataCollection[j].email.match(new RegExp(RegExp.$1,"i")));
                         }
                         catch(vErr) {
-                            vI.notificationBar.addNote(
+                            if (vI.notificationBar) vI.notificationBar.addNote(
                                 vI.main.elements.strings.getString("vident.smartIdentity.ignoreRegExp") +
                                 +filterList[i].replace(/\\/g,"\\\\") + " .",
@@ -213 +204 @@
                         break;
                     case filterType.StrCmp:
-                        add_addr = ( smartIdentities.identityDataCollection[j].email.toLowerCase().indexOf(filterList[i].toLowerCase()) != -1)
+                        add_addr = ( this._allIdentities.identityDataCollection[j].email.toLowerCase().indexOf(filterList[i].toLowerCase()) != -1)
                         break;
                 }
-                if (add_addr)   returnIdentities.addWithoutDuplicates(smartIdentities.identityDataCollection[j])
-            }
-        }
-        smartIdentities.takeOver(returnIdentities);
-    },
-    
-    __smartReplyCollectAddresses : function(hdr, allIdentities) {
+                if (add_addr)   returnIdentities.addWithoutDuplicates(this._allIdentities.identityDataCollection[j])
+            }
+        }
+        this._allIdentities.takeOver(returnIdentities);
+    },
+    
+    __smartReplyCollectAddresses : function() {
         // add emails from selected headers (stored by vI_getHeader.xul/js)
-        var reply_headers = vI.main.unicodeConverter.ConvertToUnicode(vI.main.preferences.getCharPref("smart_reply_headers")).split(/\n/)
+        var reply_headers = this._unicodeConverter.ConvertToUnicode(this._pref.getCharPref("smart_reply_headers")).split(/\n/)
                     
         for (var index = 0; index < reply_headers.length; index++) {
@@ -243 +234 @@
             
             // if mailing-list ignore to-header (usually the mailing list address)
-            if (replyHeaderNameToRead == "to" && hdr.getStringProperty("vI_list-id")) {
-                vI.notificationBar.dump("## smartIdentity: header 'list-id' found (mailinglist), skipping header 'to'\n");
+            if (replyHeaderNameToRead == "to" && this._msgHdr.getStringProperty("vI_list-id")) {
+                if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: header 'list-id' found (mailinglist), skipping header 'to'\n");
                 continue;
             }
             
             // ------------- read the stored header -------------------------------
-            var value = vI.main.unicodeConverter.ConvertToUnicode(hdr.getStringProperty("vI_" + replyHeaderNameToRead))
-            vI.notificationBar.dump("## smartIdentity: reading header '" +
+            var value = this._unicodeConverter.ConvertToUnicode(this._msgHdr.getStringProperty("vI_" + replyHeaderNameToRead))
+/*          let window3pane =  Components.classes['@mozilla.org/appshell/window-mediator;1']
+                 .getService(Components.interfaces.nsIWindowMediator)
+                 .getMostRecentWindow("mail:3pane");
+            
+            if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: found stored header '" +
+                replyHeaderNameToRead + "': '" + window3pane.virtualIdentityExtension.storedHeaders["vI_" + replyHeaderNameToRead] + "'\n");*/
+            
+            if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: reading header '" +
                 replyHeaderNameToRead + "': '" + value + "'\n");
             
             // ------------- parse address-string to get a field of single email-addresses
             var splitted = new vI.identityCollection();
-            smartIdentity.__parseHeadersWithArray(value, splitted);
-            
-            // move found addresses step by step to allIdentities, and change values if requested
+            this.__parseHeadersWithArray(value, splitted);
+            
+            // move found addresses step by step to this._allIdentities, and change values if requested
             for (var i = 0; i < splitted.number; i++) {
                 // if there is no email than it makes no sense to use it as a sender
                 if (!splitted.identityDataCollection[i].email.match(/^.*@.*$/)) {
-                    vI.notificationBar.dump("## smartIdentity:   skipping '" +
+                    if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity:   skipping '" +
                     splitted.identityDataCollection[i].email + "', no email\n")
                     continue;
@@ -268 +266 @@
                 if (replyHeaderEmptyFullNames) splitted.identityDataCollection[i].fullName = ""
 
-                allIdentities.addWithoutDuplicates(splitted.identityDataCollection[i]);
-
-                vI.notificationBar.dump("## smartIdentity:   found '" +
+                this._allIdentities.addWithoutDuplicates(splitted.identityDataCollection[i]);
+
+                if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity:   found '" +
                     splitted.identityDataCollection[i].combinedName + "'\n")
             }
@@ -277 +275 @@
     
     Reply : function() {
-        var hdr = smartIdentity.messenger.
-            messageServiceFromURI(gMsgCompose.originalMsgURI).messageURIToMsgHdr(gMsgCompose.originalMsgURI);
-
-        vI.notificationBar.dump("## smartIdentity: Reply()\n");
-
-        if (hdr && !gMsgCompose.compFields.newsgroups && !hdr.getStringProperty("vI_content_base")) {
+        if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: Reply()\n");
+
+        if (this._msgHdr && this._newsgroup && !this._msgHdr.getStringProperty("vI_content_base")) {
         //  RFC 2821 (http://www.ietf.org/rfc/rfc2821.txt) says:
         //  "4.4 Trace Information
@@ -292 +287 @@
         //  hidden option smart_detectByReceivedHeader will act as a switch for not RFC-compliant servers
             // RFC-compliant
-            if (vI.main.preferences.getBoolPref("smart_detectByReceivedHeader")) {
-                if (!hdr.getStringProperty("vI_received")) { // mail was not received
-                    vI.notificationBar.dump("## smartIdentity: reply on non-received (sent?) mail. Using SmartDraft. \n");
-                    smartIdentity.ReplyOnSent(hdr);
+            if (this._pref.getBoolPref("smart_detectByReceivedHeader")) {
+                if (!this._msgHdr.getStringProperty("vI_received")) { // mail was not received
+                    if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: reply on non-received (sent?) mail. Using SmartDraft. \n");
+                    this.ReplyOnSent();
                     return;
                 }
@@ -304 +299 @@
                 const MSG_FOLDER_FLAG_SENTMAIL = 0x0200;
 
-                if (hdr && (hdr.folder.flags & MSG_FOLDER_FLAG_SENTMAIL)) {
-                    vI.notificationBar.dump("## smartIdentity: reply from Sent folder.");
-                    if (hdr.folder.flags & MSG_FOLDER_FLAG_INBOX)
-                        vI.notificationBar.dump(" Folder is INBOX, assuming Reply-Case. \n");
+                if (this._msgHdr && (this._msgHdr.folder.flags & MSG_FOLDER_FLAG_SENTMAIL)) {
+                    if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: reply from Sent folder.");
+                    if (this._msgHdr.folder.flags & MSG_FOLDER_FLAG_INBOX)
+                        if (vI.notificationBar) vI.notificationBar.dump(" Folder is INBOX, assuming Reply-Case. \n");
                     else {
-                        vI.notificationBar.dump(" Using SmartDraft. \n");
-                        smartIdentity.ReplyOnSent(hdr);
+                        if (vI.notificationBar) vI.notificationBar.dump(" Using SmartDraft. \n");
+                        this.ReplyOnSent();
                         return;
                     }
@@ -317 +312 @@
         }
         
-        if (smartIdentity.__ignoreID()) return;
+        if (this.__ignoreID()) return;
         
         var storageIdentities = new vI.identityCollection();
-        vI.storage.getVIdentityFromAllRecipients(storageIdentities);
-        
-        var smartIdentities = new vI.identityCollection();
-        if (storageIdentities.number == 0 || !vI.main.preferences.getBoolPref("idSelection_storage_ignore_smart_reply"))
-            smartIdentity.__SmartReply(hdr, smartIdentities);
-        else vI.notificationBar.dump("## smartIdentity: SmartReply skipped, Identities in Storage found.\n");
+        this._rdfDatasourceAccess.getVIdentityFromAllRecipients(storageIdentities, this._recipients);
+        
+        if (storageIdentities.number == 0 || !this._pref.getBoolPref("idSelection_storage_ignore_smart_reply"))
+            this.__SmartReply();
+        else if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: SmartReply skipped, Identities in Storage found.\n");
 
         // merge SmartReply-Identities and Storage-Identites
-        if (vI.main.preferences.getBoolPref("idSelection_storage_prefer_smart_reply"))
-            { smartIdentities.mergeWithoutDuplicates(storageIdentities); var allIdentities = smartIdentities; }
-        else
-            { storageIdentities.mergeWithoutDuplicates(smartIdentities); var allIdentities = storageIdentities; }
-        
-        vI.notificationBar.dump("## smartIdentity: merged SmartReply & Storage, " + allIdentities.number + " address(es) left\n")
-        
-        if (allIdentities.number > 0) smartIdentity.__smartIdentitySelection(allIdentities, false);
+        if (this._pref.getBoolPref("idSelection_storage_prefer_smart_reply"))
+            { this._allIdentities.mergeWithoutDuplicates(storageIdentities); }
+        else {
+            var smartIdentities = this._allIdentities;
+            this._allIdentities = storageIdentities;        
+            this._allIdentities.mergeWithoutDuplicates(smartIdentities);
+        }
+        
+        if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: merged SmartReply & Storage, " + this._allIdentities.number + " address(es) left\n")
     },
     
     // this function checks if we have a reply-case and Smart-Reply should replace the Identity
-    __SmartReply : function(hdr, smartIdentities) {
-        if (!vI.main.preferences.getBoolPref("smart_reply"))
-            { vI.notificationBar.dump("## smartIdentity: SmartReply deactivated\n"); return; }
-        if (gMsgCompose.compFields.newsgroups && !vI.main.preferences.getBoolPref("smart_reply_for_newsgroups")) {
-            vI.notificationBar.dump("## smartIdentity: SmartReply, answering to a newsgroup, aborting\n");
+    __SmartReply : function() {
+        if (!this._pref.getBoolPref("smart_reply"))
+            { if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: SmartReply deactivated\n"); return; }
+        if (this._newsgroup && !this._pref.getBoolPref("smart_reply_for_newsgroups")) {
+            if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: SmartReply, answering to a newsgroup, aborting\n");
             return;
         }
 
-        vI.notificationBar.dump("## smartIdentity: __SmartReply()\n");
-        vI.notificationBar.dump("## smartIdentity: ----------------------------------------------------------\n")
-        if (hdr) {
+        if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: __SmartReply()\n");
+        if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: ----------------------------------------------------------\n")
+        if (this._msgHdr) {
             /* first step: collect addresses */
-            smartIdentity.__smartReplyCollectAddresses(hdr, smartIdentities);
-            vI.notificationBar.dump("## smartIdentity: " + smartIdentities.number + " address(es) after parsing, before filtering\n")
+            this.__smartReplyCollectAddresses();
+            if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: " + this._allIdentities.number + " address(es) after parsing, before filtering\n")
             
             /* second step: filter (and sort) addresses */
-            smartIdentity.__filterAddresses(smartIdentities);
-            
-            vI.notificationBar.dump("## smartIdentity: filtering done, " + smartIdentities.number + " address(es) left\n")
+            this.__filterAddresses();
+            
+            if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: filtering done, " + this._allIdentities.number + " address(es) left\n")
             
             /* set default FullName */
-            var smart_reply_defaultFullName = vI.main.unicodeConverter.ConvertToUnicode(vI.main.preferences.getCharPref("smart_reply_defaultFullName"))
+            var smart_reply_defaultFullName = this._unicodeConverter.ConvertToUnicode(this._pref.getCharPref("smart_reply_defaultFullName"))
             if (smart_reply_defaultFullName != "") {
-                for (var index = 0; index < smartIdentities.number; index++) {
-                    if (smartIdentities.identityDataCollection[index].fullName == "") {
-                        smartIdentities.identityDataCollection[index].fullName = smart_reply_defaultFullName
-                        vI.notificationBar.dump("## smartIdentity: added default FullName '" + 
-                            smart_reply_defaultFullName + "' to '" + smartIdentities.identityDataCollection[index].email + "'\n")
+                for (var index = 0; index < this._allIdentities.number; index++) {
+                    if (this._allIdentities.identityDataCollection[index].fullName == "") {
+                        this._allIdentities.identityDataCollection[index].fullName = smart_reply_defaultFullName
+                        if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: added default FullName '" + 
+                            smart_reply_defaultFullName + "' to '" + this._allIdentities.identityDataCollection[index].email + "'\n")
                     }
                 }
@@ -374 +369 @@
             /* if match replace FullName with existing one, keep identity in list by now        */
             /* will not be added to the menu but probably choosen with __smartIdentitySelection     */
-            if (vI.main.preferences.getBoolPref("smart_reply_ignoreFullName")) {
-                vI.notificationBar.dump("## smartIdentity: compare with existing Identities (ignoring FullNames).\n")
-            
-                for (var index = 0; index < smartIdentities.number; index++) {
-                    var idKey = smartIdentities.identityDataCollection[index].isExistingIdentity(true);
+            if (this._pref.getBoolPref("smart_reply_ignoreFullName")) {
+                if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: compare with existing Identities (ignoring FullNames).\n")
+            
+                for (var index = 0; index < this._allIdentities.number; index++) {
+                    var idKey = this._allIdentities.identityDataCollection[index].isExistingIdentity(true);
                     if (idKey) {
                         var newFullName = gAccountManager.getIdentity(idKey).fullName;
-                        smartIdentities.identityDataCollection[index].fullName = newFullName;
-                        vI.notificationBar.dump("## smartIdentity: replaced Fullname of '" + smartIdentities.identityDataCollection[index].email + "' with '" + newFullName + "' \n");
+                        this._allIdentities.identityDataCollection[index].fullName = newFullName;
+                        if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: replaced Fullname of '" + this._allIdentities.identityDataCollection[index].email + "' with '" + newFullName + "' \n");
                     }
                 }
             }
         }
-        else vI.notificationBar.dump("## smartIdentity: SmartReply skipped. No Header-information found.\n");
-        
-        vI.notificationBar.dump("## smartIdentity: ----------------------------------------------------------\n")
-    },
-    
-    __smartIdentitySelection : function(allIdentities, autocreate) {
-        /* compare with existing Identities                                     */
-        for (var index = 0; index < allIdentities.number; index++) {
-            var existingID = allIdentities.identityDataCollection[index].isExistingIdentity(true);
-            if (existingID) {
-                allIdentities.identityDataCollection[index].id.key = existingID;    // set found identity
-                // if 'preferExisting' than select it and return
-                if (vI.main.preferences.getBoolPref("idSelection_preferExisting")) {
-                    vI.notificationBar.dump("## smartIdentity: found existing Identity, use without interaction.\n");
-                    // add all Indentities to Clone Menu before selecting and leaving the function
-                    document.getElementById("msgIdentity_clone").addIdentitiesToCloneMenu(allIdentities);
-                    smartIdentity.changeIdentityToSmartIdentity(allIdentities, index);
-                    return;
-                }
-                // else reorder list of Identities to prefer it on autoselect
-                // has to be done before Identities are added to the Menu
-                vI.notificationBar.dump("## smartIdentity: found existing Identity, prefer this one.\n");
-                var firstIdentity = allIdentities.identityDataCollection[index];
-                for (var i = index; index > 0; index--) {
-                    allIdentities.identityDataCollection[index] = allIdentities.identityDataCollection[index-1];
-                }
-                allIdentities.identityDataCollection[0] = firstIdentity;
-                break;
-            }
-        }
-        
-        document.getElementById("msgIdentity_clone").addIdentitiesToCloneMenu(allIdentities);
-
-        if (!autocreate && vI.main.preferences.getBoolPref("idSelection_ask") && 
-            ((allIdentities.number == 1 && vI.main.preferences.getBoolPref("idSelection_ask_always"))
-                || allIdentities.number > 1)) {
-            for (var index = 0; index < allIdentities.number; index++) {
-                vI.notificationBar.dump("## smartIdentityReplyDialog index=" + index + ": '" + allIdentities.identityDataCollection[index].combinedName + "' "
-                    + "(" + allIdentities.identityDataCollection[index].id.value + "," + allIdentities.identityDataCollection[index].smtp.value + ")\n");
+        else if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: SmartReply skipped. No Header-information found.\n");
+        
+        if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: ----------------------------------------------------------\n")
+    },
+    
+
+};
+
+var smartIdentity = {
+    _pref : Components.classes["@mozilla.org/preferences-service;1"]
+        .getService(Components.interfaces.nsIPrefService)
+        .getBranch("extensions.virtualIdentity."),
+
+    messenger : Components.classes["@mozilla.org/messenger;1"].createInstance()
+        .QueryInterface(Components.interfaces.nsIMessenger),
+    
+    _smartIdentityCollection : null,
+        
+    // After Loading the MessageComposeDialog, check if smartIdentity is needed
+    init : function() {
+        var msgHdr;
+        var msgComposeTypeReference = Components.interfaces.nsIMsgCompType;
+        var newsgroup = gMsgCompose.compFields.newsgroups;
+        var autocreate = false;
+        if (vI.notificationBar) vI.notificationBar.dump("## smartIdentityCollection: msgComposeTypeReference = " + gMsgCompose.type + "\n");
+        switch (gMsgCompose.type) {
+            case msgComposeTypeReference.ForwardAsAttachment:
+            case msgComposeTypeReference.ForwardInline:
+            case msgComposeTypeReference.Reply:
+            case msgComposeTypeReference.ReplyAll:
+            case msgComposeTypeReference.ReplyToGroup: // reply to a newsgroup, would possibly be stopped later
+            case msgComposeTypeReference.ReplyToSender:
+            case msgComposeTypeReference.ReplyToSenderAndGroup: // reply to a newsgroup, would possibly be stopped later
+            case msgComposeTypeReference.ReplyWithTemplate:
+            case msgComposeTypeReference.ReplyToList:
+                if (vI.notificationBar) vI.notificationBar.dump("## smartIdentityCollection: Reply\n");
+                msgHdr = smartIdentity.messenger.
+                    messageServiceFromURI(gMsgCompose.originalMsgURI).messageURIToMsgHdr(gMsgCompose.originalMsgURI);
+                smartIdentity._smartIdentityCollection = new smartIdentityCollection(msgHdr, getCurrentIdentity(), document.getElementById("msgIdentity_clone").vid, newsgroup, this._getRecipients()); 
+                smartIdentity._smartIdentityCollection.Reply();
+                autocreate = false; break;
+            case msgComposeTypeReference.Draft:
+            case msgComposeTypeReference.Template:
+                if (vI.notificationBar) vI.notificationBar.dump("## smartIdentityCollection: Draft\n");
+                msgHdr = smartIdentity.messenger.
+                    messageServiceFromURI(gMsgCompose.compFields.draftId).messageURIToMsgHdr(gMsgCompose.compFields.draftId);
+                smartIdentity._smartIdentityCollection = new smartIdentityCollection(msgHdr, getCurrentIdentity(), document.getElementById("msgIdentity_clone").vid, newsgroup, this._getRecipients()); 
+                smartIdentity._smartIdentityCollection.Draft();
+                autocreate = false; break;
+            case msgComposeTypeReference.New:
+            case msgComposeTypeReference.NewsPost:
+            case msgComposeTypeReference.MailToUrl:
+                if (vI.notificationBar) vI.notificationBar.dump("## smartIdentityCollection: New Mail\n");
+                smartIdentity._smartIdentityCollection = new smartIdentityCollection(null, getCurrentIdentity(), document.getElementById("msgIdentity_clone").vid, newsgroup, this._getRecipients());   
+                // to enable composing new email with new identity: identity is hidden in subject line
+                // used for instance from conversation addon
+                var subject = gMsgCompose.compFields.subject.split(/\n/);
+                if (subject.length > 1 && subject[1] == "virtualIdentityExtension") {
+                    if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: NewMail() found stored identity preset: " + subject[2] + "\n");
+                    smartIdentity._smartIdentityCollection.__parseHeadersWithArray(subject[2], smartIdentity._smartIdentityCollection._allIdentities);
+                    gMsgCompose.compFields.subject = subject[0];
+                    document.getElementById("msgSubject").value = subject[0];
+                }
+                else smartIdentity._smartIdentityCollection.NewMail();
+                autocreate = true; break;
+        }
+        if (smartIdentity._smartIdentityCollection._allIdentities.number > 0) smartIdentity.__smartIdentitySelection(autocreate);
+    },
+    
+    _getRecipients : function() {
+        var recipients = [];
+        for (var row = 1; row <= top.MAX_RECIPIENTS; row ++) {
+            var recipientType = awGetPopupElement(row).selectedItem.getAttribute("value");
+            if (recipientType == "addr_reply" || recipientType == "addr_followup" || 
+                vI.storage.__isDoBcc(row) || awGetInputElement(row).value.match(/^\s*$/) ) continue;
+            recipients.push( { recipient: awGetInputElement(row).value, recipientType : recipientType } );
+        }
+        return recipients;
+    },
+    
+    __smartIdentitySelection : function(autocreate) {
+        if (vI.notificationBar) vI.notificationBar.dump("## __smartIdentitySelection autocreate=" + autocreate + "\n");
+        
+        if (smartIdentity._pref.getBoolPref("idSelection_preferExisting")) {
+            var existingIDIndex = smartIdentity._smartIdentityCollection._foundExistingIdentity();
+            if (existingIDIndex) {
+                if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: found existing Identity, use without interaction.\n");
+                // add all Indentities to Clone Menu before selecting and leaving the function
+                document.getElementById("msgIdentity_clone").addIdentitiesToCloneMenu(smartIdentity._smartIdentityCollection._allIdentities);
+                smartIdentity.changeIdentityToSmartIdentity(smartIdentity._smartIdentityCollection._allIdentities, existingIDIndex.key);
+                return;
+            }
+        }
+        
+        document.getElementById("msgIdentity_clone").addIdentitiesToCloneMenu(smartIdentity._smartIdentityCollection._allIdentities);
+        if (vI.notificationBar) vI.notificationBar.dump("## __smartIdentitySelection smartIdentity._smartIdentityCollection._allIdentities.number=" +
+                smartIdentity._smartIdentityCollection._allIdentities.number +
+                " smartIdentity._pref.getBoolPref('idSelection_ask_always')=" +
+                smartIdentity._pref.getBoolPref("idSelection_ask_always") +
+                " smartIdentity._pref.getBoolPref('idSelection_ask')=" +
+                smartIdentity._pref.getBoolPref("idSelection_ask") + "\n");
+        if (!autocreate && smartIdentity._pref.getBoolPref("idSelection_ask") && 
+            ((smartIdentity._smartIdentityCollection._allIdentities.number == 1 && smartIdentity._pref.getBoolPref("idSelection_ask_always"))
+                || smartIdentity._smartIdentityCollection._allIdentities.number > 1)) {
+            for (var index = 0; index < smartIdentity._smartIdentityCollection._allIdentities.number; index++) {
+                if (vI.notificationBar) vI.notificationBar.dump("## smartIdentityReplyDialog index=" + index + ": '" + smartIdentity._smartIdentityCollection._allIdentities.identityDataCollection[index].combinedName + "' "
+                    + "(" + smartIdentity._smartIdentityCollection._allIdentities.identityDataCollection[index].id.value + "," + smartIdentity._smartIdentityCollection._allIdentities.identityDataCollection[index].smtp.value + ")\n");
             }
             window.openDialog("chrome://v_identity/content/vI_smartReplyDialog.xul",0,
                     "chrome, dialog, modal, alwaysRaised, resizable=yes",
-                     allIdentities,
+                     smartIdentity._smartIdentityCollection._allIdentities,
                     /* callback: */ smartIdentity.changeIdentityToSmartIdentity).focus();
         }
-        else if (autocreate || vI.main.preferences.getBoolPref("idSelection_autocreate")) {
-            smartIdentity.changeIdentityToSmartIdentity(allIdentities, 0);
+        else if (autocreate || smartIdentity._pref.getBoolPref("idSelection_autocreate")) {
+            smartIdentity.changeIdentityToSmartIdentity(smartIdentity._smartIdentityCollection._allIdentities, 0);
         }   
     },
     
     changeIdentityToSmartIdentity : function(allIdentities, selectedValue) {
-        vI.notificationBar.dump("## changeIdentityToSmartIdentity selectedValue=" + selectedValue + ": '" + allIdentities.identityDataCollection[selectedValue].combinedName + "' "
+        if (vI.notificationBar) vI.notificationBar.dump("## changeIdentityToSmartIdentity selectedValue=" + selectedValue + " from " + allIdentities.number + "\n");
+        if (vI.notificationBar) vI.notificationBar.dump("## changeIdentityToSmartIdentity selectedValue=" + selectedValue + ": '" + allIdentities.identityDataCollection[selectedValue].combinedName + "' "
             + "(" + allIdentities.identityDataCollection[selectedValue].id.value + "," + allIdentities.identityDataCollection[selectedValue].smtp.value + ")\n");
         document.getElementById("msgIdentity_clone").selectedMenuItem = allIdentities.menuItems[selectedValue];
@@ -445 +509 @@
             if (allIdentities.number > 1) label += " "
                 + vI.main.elements.strings.getString("vident.smartIdentity.moreThanOne");
-            vI.notificationBar.addNote(label + ".", "smart_reply_notification");
+            if (vI.notificationBar) vI.notificationBar.addNote(label + ".", "smart_reply_notification");
         }
         smartIdentity.__removeSmartIdentityFromRecipients(allIdentities, selectedValue);
@@ -451 +515 @@
     
     __removeSmartIdentityFromRecipients : function(allIdentities, index) {
-        if (!vI.main.preferences.getBoolPref("idSelection_removeSmartIdentityFromRecipients")) return;
+        if (!smartIdentity._pref.getBoolPref("idSelection_removeSmartIdentityFromRecipients")) return;
         
         // check if selected email is defined as doBcc address. If so, it should not be removed.
@@ -488 +552 @@
                     awSetInputAndPopupValue(input, "", popup, "addr_to", -1);
                     awCleanupRows()
-                    vI.notificationBar.addNote(" " +
+                    if (vI.notificationBar) vI.notificationBar.addNote(" " +
                         vI.main.elements.strings.getString("vident.smartIdentity.remRecipient"),
                         "smart_reply_notification");
@@ -497 +561 @@
 }
 vI.smartIdentity = smartIdentity;
+vI.smartIdentityCollection = smartIdentityCollection;
 }});

chrome/content/v_identity/vI_storage.js

@@ -30 +30 @@
 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
 var storage = {
-    multipleRecipients : null,
     focusedElement : null,
+    _pref : Components.classes["@mozilla.org/preferences-service;1"]
+        .getService(Components.interfaces.nsIPrefService)
+        .getBranch("extensions.virtualIdentity."),
     
     lastCheckedEmail : {},  // array of last checked emails per row,
                 // to prevent ugly double dialogs and time-consuming double-checks
     
-    rdfService : Components.classes["@mozilla.org/rdf/rdf-service;1"]
-            .getService(Components.interfaces.nsIRDFService),
-
-    prefroot : Components.classes["@mozilla.org/preferences-service;1"]
-            .getService(Components.interfaces.nsIPrefService)
-            .getBranch(null).QueryInterface(Components.interfaces.nsIPrefBranch2),
-    
-    rdfDatasource : null,    // local storage
+    _rdfDatasourceAccess : null,    // local storage
 
     clean: function() {
@@ -51 +46 @@
         storage.firstUsedInputElement = null;
         awSetInputAndPopupValue = storage.original_functions.awSetInputAndPopupValue;
-        if (storage.rdfDatasource) storage.rdfDatasource.clean();
+        if (storage._rdfDatasourceAccess) storage._rdfDatasourceAccess.clean();
     },
     
@@ -90 +85 @@
     init: function() {
         if (!storage.initialized) {
-            storage.rdfDatasource = new vI.rdfDatasource("virtualIdentity.rdf");
+            storage._rdfDatasourceAccess = new vI.rdfDatasourceAccess();
 
             // better approach would be to use te onchange event, but this one is not fired in any change case
@@ -130 +125 @@
     
     firstUsedInputElement : null,   // this stores the first Element for which a Lookup in the Storage was successfull
-    updateVIdentityFromStorage: function(inputElement) {        
-        if (!vI.main.preferences.getBoolPref("storage"))
+    updateVIdentityFromStorage: function(inputElement) {
+        if (!storage._pref.getBoolPref("storage"))
             { vI.notificationBar.dump("## storage: Storage deactivated\n"); return; }
         vI.notificationBar.dump("## storage: updateVIdentityFromStorage()\n");
@@ -155 +150 @@
         }
         storage.lastCheckedEmail[row] = inputElement.value;
-        var recipient = storage.__getDescriptionAndType(inputElement.value, recipientType);
-
-        var matchResults = { storageData : {}, menuItem : {} };
-        matchResults.storageData[0] = storage.rdfDatasource.readVIdentityFromRDF(recipient.recDesc, recipient.recType);
-        matchResults.storageData[1] = storage.rdfDatasource.findMatchingFilter(recipient.recDesc);
-
-        vI.notificationBar.dump("## storage: updateVIdentityFromStorage add found Identities to CloneMenu.\n");
-        var matchIndex = null;
-        for (var i = 0; i <= 1; i++) {
-            if (matchResults.storageData[i]) {          // check if there is a result in direct match or filter
-                if (matchIndex == null) matchIndex = i;     // prefer direct match instead of filter
-                matchResults.menuItem[i] = document.getElementById("msgIdentity_clone")
-                                .addIdentityToCloneMenu(matchResults.storageData[i]);
-            }
-        }
-        if (matchIndex == null) {
-            vI.notificationBar.dump("## storage: updateVIdentityFromStorage no usable Storage-Data found.\n");
-            return;
-        }
-        else {
-            vI.notificationBar.dump("## storage: using data from " + ((matchIndex == 0)?"direct":"filter") + " match\n");
-        }
+        
+        // firstUsedInputElement was set before and we are not editing the same
+        var isNotFirstInputElement = (storage.firstUsedInputElement && storage.firstUsedInputElement != inputElement)
+        var currentIdentity = document.getElementById("msgIdentity_clone").identityData
+        var storageResult = storage._rdfDatasourceAccess.updateVIdentityFromStorage(inputElement.value, recipientType,
+            currentIdentity, document.getElementById("msgIdentity_clone").vid, isNotFirstInputElement);
+        
+        if (storageResult.identityCollection.number == 0) return; // return if there was no match
+        vI.notificationBar.dump("## storage: updateVIdentityFromStorage result: " + storageResult.result + "\n");
         // found storageData, so store InputElement
         if (!storage.firstUsedInputElement) storage.firstUsedInputElement = inputElement;
         
-        vI.notificationBar.dump("## storage: compare with current Identity\n");
-        if (vI.main.preferences.getBoolPref("storage_getOneOnly") &&                    // if requested to retrieve only storageID for first recipient entered
-            storage.firstUsedInputElement &&                        // and the request for the first recipient was already done
-            storage.firstUsedInputElement != inputElement &&                // and it's not the same element we changed now
-            !matchResults.storageData[matchIndex].equalsCurrentIdentity(false).equal)   // and this id is different than the current used one
-                vI.notificationBar.setNote(vI.main.elements.strings
-                    .getString("vident.smartIdentity.vIStorageCollidingIdentity"),  // than drop the potential changes
-                    "storage_notification");
-        // only update fields if new Identity is different than old one.
-        else {
-            vI.notificationBar.dump("## storage: updateVIdentityFromStorage check if storage-data matches current Identity.\n");
-            var compResult = matchResults.storageData[matchIndex].equalsCurrentIdentity(true);
-            if (!compResult.equal) {
-                var warning = storage.__getWarning("replaceVIdentity", recipient, compResult.compareMatrix);
-                var msgIdentityCloneElem = document.getElementById("msgIdentity_clone")
-                if (    !msgIdentityCloneElem.vid ||
-                    !vI.main.preferences.getBoolPref("storage_warn_vI_replace") ||
-                    (storage.__askWarning(warning) == "accept")) {
-                        msgIdentityCloneElem.selectedMenuItem = matchResults.menuItem[matchIndex];
-                        if (msgIdentityCloneElem.vid)
-                            vI.notificationBar.setNote(vI.main.elements.strings.getString("vident.smartIdentity.vIStorageUsage") + ".",
-                            "storage_notification");
-                }
-            }
-            else {
-                vI.notificationBar.dump("## storage: updateVIdentityFromStorage doing nothing - equals current Identity.\n");
+        var selectedMenuItem;
+        if (storageResult.result != "equal") {
+            for (var j = 0; j < storageResult.identityCollection.number; j++) {
+                vI.notificationBar.dump("## storage: updateVIdentityFromStorage adding: " + storageResult.identityCollection.identityDataCollection[j].combinedName + "\n");
+                selectedMenuItem = document.getElementById("msgIdentity_clone").addIdentityToCloneMenu(storageResult.identityCollection.identityDataCollection[j])
             }
         }
-    },
-    
-    __getDescriptionAndType : function (recipient, recipientType) {
-        if (recipientType == "addr_newsgroups") return { recDesc : recipient, recType : "newsgroup" }
-        else if (storage.__isMailingList(recipient)) {
-            vI.notificationBar.dump("## __getDescriptionAndType: '" + recipient + "' is MailList\n");
-            return { recDesc : storage.__getMailListName(recipient), recType : "maillist" }
+        if (storageResult.result == "accept") {
+            vI.notificationBar.dump("## storage: updateVIdentityFromStorage selecting: " + storageResult.identityCollection.identityDataCollection[0].combinedName + "\n");
+            document.getElementById("msgIdentity_clone").selectedMenuItem = selectedMenuItem;
+            if (document.getElementById("msgIdentity_clone").vid)
+                vI.notificationBar.setNote(vI.main.elements.strings.getString("vident.smartIdentity.vIStorageUsage") + ".",
+                    "storage_notification");
         }
-        else {
-            vI.notificationBar.dump("## __getDescriptionAndType: '" + recipient + "' is no MailList\n");
-            var localIdentityData = new vI.identityData(recipient, null, null, null, null, null, null);
-            return { recDesc : localIdentityData.combinedName, recType : "email" }
-        }
-    },
-        
-    storeVIdentityToAllRecipients : function(msgType) {
-        if (msgType != nsIMsgCompDeliverMode.Now) return true;
-        vI.notificationBar.dump("## storage: ----------------------------------------------------------\n")
-        if (!vI.main.preferences.getBoolPref("storage"))
-            { vI.notificationBar.dump("## storage: Storage deactivated\n"); return true; }
-        
-        if (vI.statusmenu.objStorageSaveMenuItem.getAttribute("checked") != "true") {
-            vI.notificationBar.dump("## storage: SaveMenuItem not checked.\n")
-            return true;
-        }
-        
-        vI.notificationBar.dump("## storage: storeVIdentityToAllRecipients()\n");
-        
-        // check if there are multiple recipients
-        storage.multipleRecipients = false;
-        var recipients = 0;
-        for (var row = 1; row <= top.MAX_RECIPIENTS; row ++) {
-            var recipientType = awGetPopupElement(row).selectedItem.getAttribute("value");
-            if (recipientType == "addr_reply" || recipientType == "addr_followup" || 
-                storage.__isDoBcc(row) || awGetInputElement(row).value.match(/^\s*$/) ) continue;
-            if (recipients++ == 1) {
-                storage.multipleRecipients = true
-                vI.notificationBar.dump("## storage: multiple recipients found.\n")
-                break;
-            }
-        }           
-        
-        for (var row = 1; row <= top.MAX_RECIPIENTS; row ++) {
-            var recipientType = awGetPopupElement(row).selectedItem.getAttribute("value");
-            if (recipientType == "addr_reply" || recipientType == "addr_followup" || 
-                storage.__isDoBcc(row) || awGetInputElement(row).value.match(/^\s*$/) ) continue;
-            if (!storage.__updateStorageFromVIdentity(awGetInputElement(row).value, recipientType)) {
-                vI.notificationBar.dump("## storage: --------------  aborted  ---------------------------------\n")
-                return false; // abort sending
-            }
-        }
-        vI.notificationBar.dump("## storage: ----------------------------------------------------------\n");
-        return true;
-    },
-    
-    __getWarning : function(warningCase, recipient, compareMatrix) {
-        var warning = { title: null, recLabel : null, recipient : null, warning : null, css: null, query : null, class : null };
-        warning.title = vI.main.elements.strings.getString("vident." + warningCase + ".title")
-        warning.recLabel = vI.main.elements.strings.getString("vident." + warningCase + ".recipient") + " (" + recipient.recType + "):"
-        warning.recipient = recipient.recDesc;
-        warning.warning = 
-            "<table class='" + warningCase + "'><thead><tr><th class='col1'/>" +
-                "<th class='col2'>" + vI.main.elements.strings.getString("vident." + warningCase + ".currentIdentity") + "</th>" +
-                "<th class='col3'>" + vI.main.elements.strings.getString("vident." + warningCase + ".storedIdentity") + "</th>" +
-            "</tr></thead>" +
-            "<tbody>" + compareMatrix + "</tbody>" +
-            "</table>"
-        warning.css = "vI.DialogBrowser.css";
-        warning.query = vI.main.elements.strings.getString("vident." + warningCase + ".query");
-        warning.class = warningCase;
-        return warning;
-    },
-
-    __askWarning : function(warning) {
-        var retVar = { returnValue: null };
-        var answer = window.openDialog("chrome://v_identity/content/vI_Dialog.xul","",
-                    "chrome, dialog, modal, alwaysRaised, resizable=yes",
-                     warning, retVar)
-        return retVar.returnValue;
-    },
-    
-    __updateStorageFromVIdentity : function(recipient, recipientType) {
-        vI.notificationBar.dump("## storage: __updateStorageFromVIdentity.\n")
-        var dontUpdateMultipleNoEqual = (vI.main.preferences.getBoolPref("storage_dont_update_multiple") &&
-                    storage.multipleRecipients)
-        vI.notificationBar.dump("## storage: __updateStorageFromVIdentity dontUpdateMultipleNoEqual='" + dontUpdateMultipleNoEqual + "'\n")
-        recipient = storage.__getDescriptionAndType(recipient, recipientType);
-
-        var storageDataByType = storage.rdfDatasource.readVIdentityFromRDF(recipient.recDesc, recipient.recType);
-        var storageDataByFilter = storage.rdfDatasource.findMatchingFilter(recipient.recDesc);
-        
-        // update (storing) of data by type is required if there is
-        // no data stored by type (or different data stored) and no equal filter found
-        var storageDataByTypeCompResult = storageDataByType?storageDataByType.equalsCurrentIdentity(true):null;
-        var storageDataByTypeEqual = (storageDataByType && storageDataByTypeCompResult.equal);
-        var storageDataByFilterEqual = (storageDataByFilter && storageDataByFilter.equalsCurrentIdentity(false).equal);
-        
-        var doUpdate = "";
-        if (    (!storageDataByType && !storageDataByFilterEqual) ||
-            (!storageDataByTypeEqual && !storageDataByFilterEqual && !dontUpdateMultipleNoEqual) ) {
-            vI.notificationBar.dump("## storage: __updateStorageFromVIdentity updating\n")
-            var doUpdate = "accept";
-            if (storageDataByType && !storageDataByTypeEqual && vI.main.preferences.getBoolPref("storage_warn_update")) {
-                vI.notificationBar.dump("## storage: __updateStorageFromVIdentity overwrite warning\n");
-                doUpdate = storage.__askWarning(storage.__getWarning("updateStorage", recipient, storageDataByTypeCompResult.compareMatrix));
-                if (doUpdate == "takeover") {
-                    var msgIdentityCloneElem = document.getElementById("msgIdentity_clone");
-                    msgIdentityCloneElem.selectedMenuItem = msgIdentityCloneElem.addIdentityToCloneMenu(storageDataByType);
-                    return false;
-                }
-                if (doUpdate == "abort") return false;
-            }
-        }
-        if (doUpdate == "accept") storage.rdfDatasource.updateRDFFromVIdentity(recipient.recDesc, recipient.recType);
-        return true;
-    },
-        
-    // --------------------------------------------------------------------
-    // check if recipient is a mailing list.
-    // Similiar to Thunderbird, if there are muliple cards with the same displayName the mailinglist is preferred
-    // see also https://bugzilla.mozilla.org/show_bug.cgi?id=408575
-    __isMailingList: function(recipient) {
-        let abManager = Components.classes["@mozilla.org/abmanager;1"]
-            .getService(Components.interfaces.nsIAbManager);
-        let allAddressBooks = abManager.directories;
-        while (allAddressBooks.hasMoreElements()) {
-            let ab = allAddressBooks.getNext();
-            if (ab instanceof Components.interfaces.nsIAbDirectory && !ab.isRemote) {
-                let abdirectory = abManager.getDirectory(ab.URI + 
-                    "?(and(DisplayName,=," + encodeURIComponent(storage.__getMailListName(recipient)) + ")(IsMailList,=,TRUE))");
-                if (abdirectory) {
-                    try {   // just try, sometimes there are no childCards at all...
-                        let cards = abdirectory.childCards;
-                        if (cards.hasMoreElements()) return true;   // only interested if there is at least one element...
-                    } catch(e) { }
-                }
-            }
-        }
-        return false;
-    },  
-    
-    // --------------------------------------------------------------------
-    
-    __getMailListName : function(recipient) {
-        if (recipient.match(/<[^>]*>/) || recipient.match(/$/)) {
-            var mailListName = RegExp.leftContext + RegExp.rightContext
-            mailListName = mailListName.replace(/^\s+|\s+$/g,"")
-        }
-        return mailListName;
     },
     
@@ -373 +192 @@
         }       
         return false
-    },
-
-    getVIdentityFromAllRecipients : function(allIdentities) {
-        if (!vI.main.preferences.getBoolPref("storage"))
-            { vI.notificationBar.dump("## storage: Storage deactivated\n"); return; }
-        vI.notificationBar.dump("## storage: getVIdentityFromAllRecipients()\n");
-
-        for (var row = 1; row <= top.MAX_RECIPIENTS; row ++) {
-            var recipientType = awGetPopupElement(row).selectedItem.getAttribute("value");
-            if (recipientType == "addr_reply" || recipientType == "addr_followup" || storage.__isDoBcc(row)) continue;
-            storage.lastCheckedEmail[row] = awGetInputElement(row).value;
-            var recipient = storage.__getDescriptionAndType(awGetInputElement(row).value, recipientType);
-            var storageData = storage.rdfDatasource.readVIdentityFromRDF(recipient.recDesc, recipient.recType);
-            if (storageData) allIdentities.addWithoutDuplicates(storageData);
-            storageData = storage.rdfDatasource.findMatchingFilter(recipient.recDesc);
-            if (storageData) allIdentities.addWithoutDuplicates(storageData);
-        }
-        vI.notificationBar.dump("## storage: found " + allIdentities.number + " address(es)\n")
     }
 }

chrome/content/v_identity/vI_upgrade.js

@@ -59 +59 @@
             nextVersion += parseInt(currentVersion[2])
         else nextVersion += parseInt(currentVersion[2]) + 1
-        var extVersion = document.getElementById("extVersion").getAttribute("value");
-                
+            
+        let window = Cc['@mozilla.org/appshell/window-mediator;1']
+            .getService(Ci.nsIWindowMediator)
+            .getMostRecentWindow("mail:3pane");
+        var extVersion = window.virtualIdentityExtension.extensionVersion;
+        
         // don't show the dialog if we do a one-step upgrade
         if (upgrade.versionChecker.compare(extVersion, nextVersion) <= 0) {

chrome/content/v_identity/vI_upgradeOverlay.js

@@ -58 +58 @@
         }); 
         
+        const virtualIdentity_ID="{dddd428e-5ac8-4a81-9f78-276c734f75b8}"
+        AddonManager.getAddonByID(virtualIdentity_ID, function(addon) {
+            if (addon) vI.extensionVersion = addon.version;
+        });
         
         if (prefroot.getBoolPref("extensions.virtualIdentity.error_console")) {

chrome/content/v_identity/vI_upgradeOverlay.xul

@@ -41 +41 @@
     <script type="application/x-javascript" src="chrome://v_identity/content/vI_account.js" />
     <script type="application/x-javascript" src="chrome://v_identity/content/vI_rdfDatasource.js" />
-    <script type="application/x-javascript" src="chrome://v_identity/content/vI_storageExtras.js" />
     <script type="application/x-javascript" src="chrome://v_identity/content/vI_upgradeOverlay.js" />
 
-    // include following scripts to enable quick_upgrade
+    <!-- include following scripts to enable quick_upgrade -->
     <script type="application/x-javascript" src="chrome://v_identity/content/vI_upgrade.js" />
     <script type="application/x-javascript" src="chrome://v_identity/content/vI_storage.js" />
     <script type="application/x-javascript" src="chrome://v_identity/content/vI_identityData.js" />
     <script type="application/x-javascript" src="chrome://v_identity/content/vI_helper.js" />
+    <!-- include following script to enable conversation plugin -->
+    <script type="application/x-javascript" src="chrome://v_identity/content/vI_smartIdentity.js" />
 
     <vbox id="messagepanebox" >
-        <!-- following element just stores the Ext-Version, seamonkey has no extensionmanager -->
-        <label id="extVersion" value="&vident.version;" hidden="true" />
         <splitter id="vIErrorBoxSplitter" hidden="true" />
         <vbox id="vIErrorBox" context="ConsoleContext" sortOrder="reverse" hidden="true" />
-
     </vbox>
 </overlay>

chrome/content/v_identity/v_identity.js

@@ -34 +34 @@
     unicodeConverter : Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]
                 .createInstance(Components.interfaces.nsIScriptableUnicodeConverter),
+                            
+    accountManager : Components.classes["@mozilla.org/messenger/account-manager;1"]
+            .getService(Components.interfaces.nsIMsgAccountManager),
+        
 
     gMsgCompose : null, // to store the global gMsgCompose after MsgComposeDialog is closed
@@ -80 +84 @@
         FillIdentityList: function(menulist) {
             vI.notificationBar.dump("## v_identity: mod. FillIdentityList\n");
-            var mgr = Components.classes["@mozilla.org/messenger/account-manager;1"]
-                                .getService(Components.interfaces.nsIMsgAccountManager);
-            var accounts = queryISupportsArray(mgr.accounts,
+            var accounts = queryISupportsArray(main.accountManager.accounts,
                                      Components.interfaces.nsIMsgAccount);
 
@@ -88 +90 @@
             accounts = accounts.filter(function isNonSuckyAccount(a) { return !!a.incomingServer; });
             function sortAccounts(a, b) {
-                if (a.key == mgr.defaultAccount.key)
+                if (a.key == main.accountManager.defaultAccount.key)
                 return -1;
-                if (b.key == mgr.defaultAccount.key)
+                if (b.key == main.accountManager.defaultAccount.key)
                 return 1;
                 var aIsNews = a.incomingServer.type == "nntp";
@@ -133 +135 @@
             vI.storage.awOnBlur(vI.storage.focusedElement);
 
-            var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-                .getService(Components.interfaces.nsIPromptService);
             vI.notificationBar.dump("\n## v_identity: VIdentity_GenericSendMessage\n");
             
+            if (msgType == Components.interfaces.nsIMsgCompDeliverMode.Now) { vI.msgIdentityCloneTools.addReplyToSelf(); }
+
             var vid = document.getElementById("msgIdentity_clone").vid
-
-            if (msgType == nsIMsgCompDeliverMode.Now) {
-                if ( (vid && main.preferences.getBoolPref("warn_virtual") &&
-                    !(promptService.confirm(window,"Warning",
-                        main.elements.strings.getString("vident.sendVirtual.warning")))) ||
-                  (!vid && main.preferences.getBoolPref("warn_nonvirtual") &&
-                    !(promptService.confirm(window,"Warning",
-                        main.elements.strings.getString("vident.sendNonvirtual.warning")))) ) {
+            var virtualIdentityData = document.getElementById("msgIdentity_clone").identityData;
+            
+            returnValue = vI.prepareSendMsg(    vid, msgType, virtualIdentityData,
+                            main.accountManager.getIdentity(main.elements.Obj_MsgIdentity.value),
+                            main._getRecipients() );
+            if (returnValue.update == "abort") {
+                main.replacement_functions.GenericSendMessageInProgress = false;
+                vI.notificationBar.dump("## sending: --------------  aborted  ---------------------------------\n")
+                return;
+            }
+            else if (returnValue.update == "takeover") {
+                    var msgIdentityCloneElem = document.getElementById("msgIdentity_clone");
+                    msgIdentityCloneElem.selectedMenuItem = msgIdentityCloneElem.addIdentityToCloneMenu(returnValue.storedIdentity);
                     main.replacement_functions.GenericSendMessageInProgress = false;
+                    vI.notificationBar.dump("## sending: --------------  aborted  ---------------------------------\n")
                     return;
-                }
-                if (!vI.storage.storeVIdentityToAllRecipients(msgType)) {
-//                  vI.notificationBar.dump("## v_identity: sending aborted\n");
-                    main.replacement_functions.GenericSendMessageInProgress = false;
-                    return;
-                }
-                vI.msgIdentityCloneTools.addReplyToSelf();
-            }
-            if (vid) main.prepareAccount();
+            }
+            
+            if (vid) main.addVirtualIdentityToMsgIdentityMenu();
+            
+            // final check if eyerything is nice before we handover to the real sending...
+            if (vI.finalCheck(virtualIdentityData, getCurrentIdentity())) {
+                main.replacement_functions.GenericSendMessageInProgress = false;
+                main.original_functions.GenericSendMessage(msgType);
+            }
+            else    main.Cleanup();
             main.replacement_functions.GenericSendMessageInProgress = false;
-//          vI.notificationBar.dump("## v_identity: original_functions.GenericSendMessage\n");
-
-            // final check if eyerything is nice before we handover to the real sending...
-            var virtualIdentityData = document.getElementById("msgIdentity_clone").identityData;
-
-            var currentIdentity = getCurrentIdentity();
-            //                          vI.identityData(email, fullName, id, smtp, extras, sideDescription, existingID)
-            var currentIdentityData = new vI.identityData(currentIdentity.email, currentIdentity.fullName, null, currentIdentity.smtpServerKey, null, null, null);
-            
-            vI.notificationBar.dump("\n## vI.identityData GenericSendMessage Final Check\n");
-            vI.notificationBar.dump("## vI.identityData currentIdentity: fullName='" + currentIdentityData.fullName + "' email='" + currentIdentityData.email + "' smtp='" + currentIdentityData.smtp.key + "'\n");
-            vI.notificationBar.dump("## vI.identityData virtualIdentityData: fullName='" + virtualIdentityData.fullName + "' email='" + virtualIdentityData.email + "' smtp='" + virtualIdentityData.smtp.key + "'\n");
-
-            if  (currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase()   &&
-                currentIdentityData.email.toLowerCase() == virtualIdentityData.email.toLowerCase()      &&
-                virtualIdentityData.smtp.equal(currentIdentityData.smtp)    ) {
-                    main.original_functions.GenericSendMessage(msgType);
-            }
-            else {
-                if (!(currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase())) vI.notificationBar.dump("\n## vI.identityData failed check for fullName.\n");
-                if (!(currentIdentityData.email.toLowerCase() == virtualIdentityData.email.toLowerCase())) vI.notificationBar.dump("\n## vI.identityData failed check for email.\n");
-                if (!(virtualIdentityData.smtp.equal(currentIdentityData.smtp))) vI.notificationBar.dump("\n## vI.identityData failed check for SMTP.\n");
-                alert(main.elements.strings.getString("vident.genericSendMessage.error"));
-                main.Cleanup();
-            }
-//          vI.notificationBar.dump("## v_identity: original_functions.GenericSendMessage done\n");
+            //          vI.notificationBar.dump("## v_identity: original_functions.GenericSendMessage done\n");
         },
         
@@ -199 +183 @@
         main.Cleanup();
         vI.storage.clean();
+    },
+
+    _getRecipients : function(row) {
+        var recipients = [];
+        for (var row = 1; row <= top.MAX_RECIPIENTS; row ++) {
+            var recipientType = awGetPopupElement(row).selectedItem.getAttribute("value");
+            if (recipientType == "addr_reply" || recipientType == "addr_followup" || 
+                main._recipientIsDoBcc(row) || awGetInputElement(row).value.match(/^\s*$/) ) continue;
+            recipients.push( { recipient: awGetInputElement(row).value, recipientType : recipientType } );
+        }
+        return recipients;
+    },
+    
+    _recipientIsDoBcc : function(row) {
+        var recipientType = awGetPopupElement(row).selectedItem.getAttribute("value");
+        if (recipientType != "addr_bcc" || !getCurrentIdentity().doBcc) return false
+
+        var doBccArray = gMsgCompose.compFields.splitRecipients(getCurrentIdentity().doBccList, false, {});
+
+        for (var index = 0; index < doBccArray.count; index++ ) {
+            if (doBccArray.StringAt(index) == awGetInputElement(row).value) {
+                vI.notificationBar.dump("## main _recipientIsDoBcc: ignoring doBcc field '" +
+                    doBccArray.StringAt(index) + "'.\n");
+                return true;
+            }
+        }       
+        return false
     },
 
@@ -231 +242 @@
         document.getElementById("msgIdentity_clone").init();
         vI.statusmenu.init();
+        vI.notificationBar.dump("## v_identity: initSystemStage1 done.\n")
     },
     
@@ -238 +250 @@
         vI.storage.init();
         vI.smartIdentity.init();
+        vI.notificationBar.dump("## v_identity: initSystemStage2 done.\n")
     },
     
@@ -286 +299 @@
         // clean all elements
         document.getElementById("msgIdentity_clone").clean();
-        vI.smartIdentity.clean();
         vI.notificationBar.dump("## v_identity: everything cleaned.\n")
         
@@ -356 +368 @@
     prepareAccount : function() {
         main.Cleanup(); // just to be sure that nothing is left (maybe last time sending was irregularily stopped)
-        vI.account.createAccount();
+        vI.account.createAccount(document.getElementById("msgIdentity_clone").identityData,
+                                 main.accountManager.getIdentity(main.elements.Obj_MsgIdentity.value));
         main.addVirtualIdentityToMsgIdentityMenu();
     },

chrome/content/v_identity/v_identity.xul

@@ -52 +52 @@
     <stringbundle id="vIdentBundle" src="chrome://v_identity/locale/v_identity.properties" />
     <stringbundle id="vIStorageExtrasBundle" src="chrome://v_identity/locale/vI_storageExtras.properties" />
-    <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties" />
   </stringbundleset>