vw_small

commit d989a19f764c5838e6a4ae698af2e32af567a3fe
parent ebf40099f2fc73cc5309ddd7fff6a679dc9ae839
Author: BlackDex <black.dex@gmail.com>
Date:   Fri, 11 Oct 2019 11:22:13 +0200

Merge branch 'master' of https://github.com/dani-garcia/bitwarden_rs into totp-timedrift

Diffstat:
M
README.md
 | 
2
+-
M
src/api/icons.rs
 | 
13
+++++--------

2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
@@ -50,6 +50,6 @@ See the [bitwarden_rs wiki](https://github.com/dani-garcia/bitwarden_rs/wiki) fo
 
 ## Get in touch
 
-To ask an question, [raising an issue](https://github.com/dani-garcia/bitwarden_rs/issues/new) is fine, also please report any bugs spotted here.
+To ask a question, [raising an issue](https://github.com/dani-garcia/bitwarden_rs/issues/new) is fine. Please also report any bugs spotted here.
 
 If you prefer to chat, we're usually hanging around at [#bitwarden_rs:matrix.org](https://matrix.to/#/#bitwarden_rs:matrix.org) room on Matrix. Feel free to join us!
diff --git a/src/api/icons.rs b/src/api/icons.rs
@@ -61,14 +61,7 @@ fn icon(domain: String) -> Content<Vec<u8>> {
         return Content(icon_type, FALLBACK_ICON.to_vec());
     }
 
-    if check_icon_domain_is_blacklisted(&domain) {
-        warn!("Domain is blacklisted: {:#?}", domain);
-        return Content(icon_type, FALLBACK_ICON.to_vec());
-    }
-
-    let icon = get_icon(&domain);
-
-    Content(icon_type, icon)
+    Content(icon_type, get_icon(&domain))
 }
 
 fn check_icon_domain_is_blacklisted(domain: &str) -> bool {
@@ -380,6 +373,10 @@ fn parse_sizes(sizes: Option<String>) -> (u16, u16) {
 }
 
 fn download_icon(domain: &str) -> Result<Vec<u8>, Error> {
+    if check_icon_domain_is_blacklisted(domain) {
+        err!("Domain is blacklisted", domain)
+    }
+
     let (iconlist, cookie_str) = get_icon_url(&domain)?;
 
     let mut buffer = Vec::new();