Changeset 994fa9

Timestamp:

Sep 10, 2018, 1:43:05 PM (2 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

cadf2f

Parents:

2d2cb7

Message:

added smtp-Label and Account Description

File:

• modules/vI_identityData.js (modified) (11 diffs)

modules/vI_identityData.js

@@ -138 +138 @@
     return this.__makeHtml(this.id.value);
   },
+  get smtpHtml() {
+    return this.__makeHtml(this.id.smtpServerName);
+  },
   get fullNameHtml() {
     return this.__makeHtml(this.fullName);
@@ -150 +153 @@
   get idLabel() {
     return this.stringBundle.GetStringFromName("vident.identityData.baseID")
+  },
+  get smtpLabel() {
+    return this.stringBundle.GetStringFromName("vident.identityData.SMTP")
   },
   get fullNameLabel() {
@@ -189 +195 @@
   // dependent on MsgComposeCommands, should/will only be called in ComposeDialog
   isExistingIdentity: function (ignoreFullNameWhileComparing) {
-    Log.debug("isExistingIdentity: ignoreFullNameWhileComparing='" + ignoreFullNameWhileComparing + "'");
+    var intenseDebug = false;
+    if (intenseDebug)
+      Log.debug("isExistingIdentity: ignoreFullNameWhileComparing='" + ignoreFullNameWhileComparing + "'");
     //      Log.debug("base: fullName.toLowerCase()='" + this.fullName + "' email.toLowerCase()='" + this.email + "'");
 
@@ -209 +217 @@
           // if fullName matches, than this is a final match
           if (this.fullName.toLowerCase() == identity.fullName.toLowerCase()) {
-            Log.debug("isExistingIdentity: " + this.combinedName + " found, id='" + identity.key + "'");
+            if (intenseDebug)
+              Log.debug("isExistingIdentity: " + this.combinedName + " found, id='" + identity.key + "'");
             return identity.key; // return key and stop searching
           }
@@ -219 +228 @@
 
     if (ignoreFullNameWhileComparing && ignoreFullNameMatchKey) {
-      Log.debug("isExistingIdentity: " + this.combinedName + " found, id='" + ignoreFullNameMatchKey + "'");
+      if (intenseDebug)
+        Log.debug("isExistingIdentity: " + this.combinedName + " found, id='" + ignoreFullNameMatchKey + "' (without FullName match)");
       return ignoreFullNameMatchKey;
     }
 
-    Log.debug("isExistingIdentity: " + this.combinedName + " not found");
+    if (intenseDebug)
+      Log.debug("isExistingIdentity: " + this.combinedName + " not found");
     return null;
   },
@@ -266 +277 @@
       return false;
     
+    var intenseDebug = false;
+    if (intenseDebug) Log.debug("compareIdentityData");
+    
     this.comp.compareID = compareIdentityData;
 
     this.comp.equals.fullName = (((this.fullName) ? this.fullName.toLowerCase() : null) == ((compareIdentityData.fullName) ? compareIdentityData.fullName.toLowerCase() : null));
-    if (!this.comp.equals.fullName) {
-      //       Log.debug("fullName not equal ('" + ((this.fullName)?this.fullName.toLowerCase():null) + "' != '" + ((compareIdentityData.fullName)?compareIdentityData.fullName.toLowerCase():null) + "')");
+    if (intenseDebug && !this.comp.equals.fullName) {
+            Log.debug("fullName not equal ('" + ((this.fullName)?this.fullName.toLowerCase():null) + "' != '" + ((compareIdentityData.fullName)?compareIdentityData.fullName.toLowerCase():null) + "')");
     }
     this.comp.equals.email = (((this.email) ? this.email.toLowerCase() : null) == ((compareIdentityData.email) ? compareIdentityData.email.toLowerCase() : null));
-    if (!this.comp.equals.email) {
-      //       Log.debug("email not equal ('" + ((this.email)?this.email.toLowerCase():null) + "' != '" + ((compareIdentityData.email)?compareIdentityData.email.toLowerCase():null) + "')");
+    if (intenseDebug && !this.comp.equals.email) {
+            Log.debug("email not equal ('" + ((this.email)?this.email.toLowerCase():null) + "' != '" + ((compareIdentityData.email)?compareIdentityData.email.toLowerCase():null) + "')");
     }
 
     this.comp.equals.id = this.id.equal(compareIdentityData.id);
+    if (intenseDebug && !this.comp.equals.id) {
+            Log.debug("id not equal ('" + this.id + "' != '" + compareIdentityData.id + "')");
+    }
+
     this.comp.equals.extras = this.extras ? this.extras.equal(compareIdentityData.extras) : true;
+    if (intenseDebug && !this.comp.equals.extras) {
+            Log.debug("extras not equal");
+    }
 
     return (this.comp.equals.fullName && this.comp.equals.email && this.comp.equals.id && this.comp.equals.extras);
@@ -313 +334 @@
   getMatrix: function () {
     var string = "";
-    if (this["idHtml"])
+    if (this["idHtml"]) {
         string = "<tr><td class='col1'>" + this["idLabel"] + ":</td>" +
-        "<td class='col2'>" + this["idHtml"] + "</td></tr>"
+        "<td class='col2'>" + this["idHtml"] + "</td></tr>" +
+        "<tr><td class='col1'>" + this["smtpLabel"] + ":</td>" +
+        "<td class='col2'>" + this["smtpHtml"] + "</td></tr>";
+    }
     string += this.extras ? this.extras.getMatrix() : "";
     return string;
@@ -385 +409 @@
   _value: null,
   _accountkey: null,
+  _accountIncomingServerPrettyName: null,
+  _accountManager: Components.classes["@mozilla.org/messenger/account-manager;1"]
+    .getService(Components.interfaces.nsIMsgAccountManager),
 
   set key(key) {
@@ -398 +425 @@
     return this._accountkey
   },
+  
+  get accountIncomingServerPrettyName() {
+    if (this._value == null) var dummy = this.value;
+    return this._accountIncomingServerPrettyName
+  },
+  
   get value() {
     if (this._value == null) {
@@ -413 +446 @@
             this._value = identity.identityName;
             this._accountkey = account.key;
+            this._accountIncomingServerPrettyName = account.incomingServer.prettyName;
             break;
           }
@@ -428 +462 @@
     if (!this.key)
       return null;
-    var AccountManager = Components.classes["@mozilla.org/messenger/account-manager;1"]
-          .getService(Components.interfaces.nsIMsgAccountManager);
-
-    var identity = AccountManager.getIdentity(this.key);
+
+    var identity = this._accountManager.getIdentity(this.key);
     if (identity) {
       if (identity.smtpServerKey)