Bug 1292340 - Don't issue login manager warnings about recommended search criteria when a guid is specified. r?MattN
MozReview-Commit-ID: 3dJDLbXMOUy
--- a/toolkit/components/passwordmgr/nsLoginManager.js
+++ b/toolkit/components/passwordmgr/nsLoginManager.js
@@ -375,22 +375,24 @@ LoginManager.prototype = {
* JavaScript object and decrypt the results.
*
* @return {nsILoginInfo[]} which are decrypted.
*/
searchLogins(count, matchData) {
log.debug("Searching for logins");
matchData.QueryInterface(Ci.nsIPropertyBag2);
- if (!matchData.hasKey("hostname")) {
- log.warn("searchLogins: A `hostname` is recommended");
- }
+ if (!matchData.hasKey("guid")) {
+ if (!matchData.hasKey("hostname")) {
+ log.warn("searchLogins: A `hostname` is recommended");
+ }
- if (!matchData.hasKey("formSubmitURL") && !matchData.hasKey("httpRealm")) {
- log.warn("searchLogins: `formSubmitURL` or `httpRealm` is recommended");
+ if (!matchData.hasKey("formSubmitURL") && !matchData.hasKey("httpRealm")) {
+ log.warn("searchLogins: `formSubmitURL` or `httpRealm` is recommended");
+ }
}
return this._storage.searchLogins(count, matchData);
},
/**
* Search for the known logins for entries matching the specified criteria,