AddressBook: get the right username for address books when the user s…

…etting is the user mail and the domain setting is empty (fix #325 and #290)
Ericsson · Sep 22, 2015 · ca72783 · ca72783
1 parent f4de403
commit ca72783
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/interfaces/exchangeAddressBook/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js b/interfaces/exchangeAddressBook/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js
@@ -999,7 +999,18 @@ exchangeAbDistListDirectory.prototype = {
 	},
 
 	get user() {
-		return this.domain+"\\"+exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
+		var username = exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
+		if (username.indexOf("@") > -1) {
+			return username;
+		}
+		else {
+			if (this.domain == "") {
+				return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
+			}
+			else {
+				return this.domain+"\\"+exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
+			}
+		}
 	},
 
 	set user(value) {

diff --git a/interfaces/exchangeAddressBook/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js b/interfaces/exchangeAddressBook/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js
@@ -1126,7 +1126,18 @@ try {
 	},
 
 	get user() {
-		return this.domain+"\\"+exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
+		var username = exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
+		if (username.indexOf("@") > -1) {
+			return username;
+		}
+		else {
+			if (this.domain == "") {
+				return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
+			}
+			else {
+				return this.domain+"\\"+exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
+			}
+		}
 	},
 
 	set user(value) {