Changeset a2f8236

Timestamp:

Feb 2, 2010, 1:44:20 PM (13 years ago)

Author:

rene <rene@…>

Branches:

multiEdit, ng_0.6, ng_0.8, ng_0.9

Children:

b14c0f

Parents:

baca9e

Message:

ensure that new identity is changed before GenericSendMessage? is called

Location:

chrome

Files:

• content/v_identity/v_identity.js (modified) (3 diffs)
• locale/en-US/v_identity/v_identity.properties (modified) (1 diff)

chrome/content/v_identity/v_identity.js

@@ -178 +178 @@
             vI.replacement_functions.GenericSendMessageInProgress = false;
 //          vI_notificationBar.dump("## v_identity: original_functions.GenericSendMessage\n");
-            vI.original_functions.GenericSendMessage(msgType);
-
+
+            // final check if eyerything is nice before we handover to the real sending...
+            var virtualIdentityData = document.getElementById("msgIdentity_clone").identityData;
+            var currentIdentity = getCurrentIdentity();
+            if (    currentIdentity.fullName == virtualIdentityData.fullName    &&
+                currentIdentity.email == virtualIdentityData.email      &&
+                currentIdentity.smtpServerKey == virtualIdentityData.smtp.keyNice   ) {
+                    vI.original_functions.GenericSendMessage(msgType);
+            }
+            else {
+                alert(vI.elements.strings.getString("vident.genericSendMessage.error"));
+            }
 //          vI_notificationBar.dump("## v_identity: original_functions.GenericSendMessage done\n");
         },
@@ -212 +222 @@
         vI_notificationBar.dump("\n## v_identity: init.\n")
         vI.unicodeConverter.charset="UTF-8";
+        if (!vI.adapt_genericSendMessage()) { vI_notificationBar.dump("\n## v_identity: init failed.\n"); return; }
         vI.adapt_interface();
-        vI.adapt_genericSendMessage();
         gMsgCompose.RegisterStateListener(vI.ComposeStateListener);
         document.getElementById("vI_tooltipPopupset")
@@ -270 +280 @@
     
     adapt_genericSendMessage : function() {
-        if (vI.original_functions.GenericSendMessage) return; // only initialize this once
+        if (vI.original_functions.GenericSendMessage) return true; // only initialize this once
         vI_notificationBar.dump("## v_identity: adapt GenericSendMessage\n");
         vI.original_functions.GenericSendMessage = GenericSendMessage;
         GenericSendMessage = vI.replacement_functions.GenericSendMessage;
+        return true;
     },
     

chrome/locale/en-US/v_identity/v_identity.properties

@@ -2 +2 @@
 vident.sendLater.prefix= Replace Virtual Identity with Default Identity (
 vident.sendLater.postfix= ) ?
+
+vident.genericSendMessage.error=Virtual Identity Error: Can't change Identity before Sending.\nPlease report at https://add-on-it.de/virtual-id/newticket
 
 vident.updateStorage.title=You already have a Virtual Identity stored for this recipient.