Changeset 623401

Timestamp:

Nov 9, 2011, 2:08:14 PM (11 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

184c6c

Parents:

5d26a6

Message:

cleanup and change for new conversation plugin

File:

• chrome/content/v_identity/modules/plugins/conversation.js (modified) (8 diffs)

chrome/content/v_identity/modules/plugins/conversation.js

@@ -15 +15 @@
   .getService(Ci.nsIMsgHeaderParser);
 
-let virtualIdentityData;
-let virtualIdSenderName;
+let currentIdentityData;
+let currentIdSenderName;
 let virtualIdInUse;
 let virtualSenderNameElem;
@@ -28 +28 @@
 let _changeIdentityToSmartIdentity = function(identityData) {
   Log.debug("## changeIdentityToSmartIdentity\n");
-  // add code to set stored base identity
+  
   if ( identityData.id.key != null ) {
     currentParams.identity = AccountManager.getIdentity(identityData.id.key);
     Log.debug("## changed base identity to ", identityData.id.key);
-    virtualSenderNameElem.text(virtualIdSenderName);
+    virtualSenderNameElem.text(currentIdSenderName);
   }
   virtualIdInUse = !(identityData.isExistingIdentity(false));
   Log.debug("## changeIdentityToSmartIdentity virtualIdInUse=" + virtualIdInUse + "\n");
   if (virtualIdInUse) {
-    virtualIdentityData = identityData;
-    virtualIdSenderName = virtualIdentityData.combinedName;
+    currentIdentityData = identityData;
+    currentIdSenderName = currentIdentityData.combinedName;
   }
   virtualSenderNameElem.text(identityData.combinedName); // change this also to reflect changes of base id
@@ -44 +44 @@
 
 let conversationHook = {
-  onComposeSessionConstructDone: function (recipientString, params, senderNameElem, ExternalLog) {
-    // this.params = { identity: ???, msgHdr: ???, subject: ??? };
+  onComposeSessionChanged: function (aComposeSession, aAddress, ExternalLog) {
     Log = ExternalLog;
-
-    currentParams = params; virtualSenderNameElem = senderNameElem; // to enable access from out of this class.
-    virtualIdentityData = null; virtualIdInUse = false; virtualIdSenderName = "";
+    let toAddrList = aAddress.to.concat(aAddress.cc);
+    
+    currentParams = aComposeSession.params; virtualSenderNameElem = aComposeSession.senderNameElem; // to enable access from out of this class.
+    let identity = aComposeSession.params.identity;
+    
+    let server = AccountManager.GetServersForIdentity(identity).QueryElementAt(0, Components.interfaces.nsIMsgIncomingServer);
+    currentIdentityData = new virtualIdentityExtension.identityData(identity.email, identity.fullName, identity.key,
+                                                                    identity.smtpServerKey, null, server.prettyName, true)
+    currentIdSenderName = currentIdentityData.combinedName;
+    virtualIdInUse = false;
     
     let recipients = []; var combinedNames = {}; var number;
-    number = HeaderParser.parseHeadersWithArray(recipientString, {}, {}, combinedNames);
+    number = HeaderParser.parseHeadersWithArray(toAddrList.join(", "), {}, {}, combinedNames);
     for (var index = 0; index < number; index++)
       recipients.push( { recipient: combinedNames.value[index], recipientType: "addr_to" } )
       
-    var localSmartIdentityCollection = new vI.smartIdentityCollection(params.msgHdr, params.identity, false, false, recipients);
+    var localSmartIdentityCollection = new vI.smartIdentityCollection(aComposeSession.params.msgHdr, identity, 
+                                                                      false, false, recipients);
     localSmartIdentityCollection.Reply();   // we can always use the reply-case, msgHdr is set the right way
     
-    if (localSmartIdentityCollection._allIdentities.number == 0) return;
+    if (localSmartIdentityCollection._allIdentities.number == 0)
+      return;
   
     if (pref.getBoolPref("idSelection_preferExisting")) {
@@ -78 +86 @@
           /* callback: */ changeIdentityToSmartIdentity).focus();
       }
-    else if (pref.getBoolPref("idSelection_autocreate")) changeIdentityToSmartIdentity(localSmartIdentityCollection._allIdentities, 0);
+    else if (pref.getBoolPref("idSelection_autocreate"))
+      changeIdentityToSmartIdentity(localSmartIdentityCollection._allIdentities, 0);
   },
   
-  onMessageBeforeSendOrPopup: function(gComposeParams, recipientString, popOut, aStatus, ExternalLog) {
+  onMessageBeforeSendOrPopout: function(aAddress, aStatus, aPopout, ExternalLog) {
     Log = ExternalLog;
-    Log.debug("## onMessageBeforeSendOrPopup", recipientString);
+    let toAddrList = aAddress.to.concat(aAddress.cc);
+    Log.debug("## onMessageBeforeSendOrPopup");
     
     if (virtualIdInUse) {
-      if (!popOut) {
+      if (!aPopout) {
         let recipients = []; var combinedNames = {}; var number;
-        number = HeaderParser.parseHeadersWithArray(recipientString, {}, {}, combinedNames);
+        number = HeaderParser.parseHeadersWithArray(toAddrList.join(", "), {}, {}, combinedNames);
         for (var index = 0; index < number; index++)
           recipients.push( { recipient: combinedNames.value[index], recipientType: "addr_to" } )
 
         returnValue = vI.prepareSendMsg(virtualIdInUse, Ci.nsIMsgCompDeliverMode.Now,
-          virtualIdentityData, gComposeParams.identity, recipients );
+          currentIdentityData, aAddress.params.identity, recipients );
         Log.debug("returnValue.update:", returnValue.update);
         
@@ -104 +114 @@
         }
         
-        gComposeParams.identity = vI.account._account.defaultIdentity
-        if (!vI.finalCheck(virtualIdentityData, gComposeParams.identity)) {
+        aAddress.params.identity = vI.account._account.defaultIdentity
+        if (!vI.finalCheck(currentIdentityData, aAddress.params.identity)) {
           vI.account.removeUsedVIAccount();
           aStatus.canceled = true; return aStatus;
@@ -112 +122 @@
       else {
         // code virtual Identity into subject - this will be decoded by smartIdentity - newMail
-        gComposeParams.subject = gComposeParams.subject + "\nvirtualIdentityExtension\n" + virtualIdSenderName;
-        Log.debug("coding virtualIdentity into subject:", gComposeParams.subject);
+        aAddress.params.subject = aAddress.params.subject + "\nvirtualIdentityExtension\n" + currentIdSenderName;
+        Log.debug("coding virtualIdentity into subject:", aAddress.params.subject);
       }
     }
@@ -125 +135 @@
   },
 
-  onRecipientAdded: function onRecipientAdded(recipient, recipientType, count, ExternalLog) {
+  onRecipientAdded: function onRecipientAdded(aData, aType, aCount, ExternalLog) {
     Log = ExternalLog;
-    Log.debug("onRecipientAdded", recipient, recipientType, count);
+    
+    Log.debug("onRecipientAdded", aData.data, aType, aCount);
     if (!pref.getBoolPref("storage")) return;
-    if (recipientType == "bcc") return;
-    if (recipient == "") return;
+    if (aType == "bcc") return;
+    if (aData.data == "") return;
 
     // if we are editing the "cc" or not the first recipient, recognize this.
-    var isNotFirstInputElement = !(recipientType == "to" && count == 0);
+    var isNotFirstInputElement = !(aType == "to" && aCount == 0);
     Log.debug("onRecipientAdded isNotFirstInputElement", isNotFirstInputElement);
     
@@ -139 +150 @@
     else _rdfDatasourceAccess.clean();
     
-    var storageResult = _rdfDatasourceAccess.updateVIdentityFromStorage(recipient, "addr_to",
-      virtualIdentityData, virtualIdInUse, isNotFirstInputElement);
+    var storageResult = _rdfDatasourceAccess.updateVIdentityFromStorage(aData.data, "addr_to",
+      currentIdentityData, virtualIdInUse, isNotFirstInputElement);
     
     if (storageResult.identityCollection.number == 0) return; // return if there was no match