website icons enabled property

src/Android/Renderers/CipherViewCellRenderer.cs

@@ -60,6 +60,10 @@ namespace Bit.Droid.Renderers
             {
                 _cell.UpdateCell(cipherCell);
             }
+            else if(e.PropertyName == CipherViewCell.WebsiteIconsEnabledProperty.PropertyName)
+            {
+                _cell.UpdateIconImage(cipherCell);
+            }
         }
     }
 
@@ -105,6 +109,25 @@ namespace Bit.Droid.Renderers
         public Android.Widget.Button MoreButton { get; set; }
 
         public void UpdateCell(CipherViewCell cipherCell)
+        {
+            UpdateIconImage(cipherCell);
+
+            var cipher = cipherCell.Cipher;
+            Name.Text = cipher.Name;
+            if(!string.IsNullOrWhiteSpace(cipher.SubTitle))
+            {
+                SubTitle.Text = cipher.SubTitle;
+                SubTitle.Visibility = ViewStates.Visible;
+            }
+            else
+            {
+                SubTitle.Visibility = ViewStates.Gone;
+            }
+            SharedIcon.Visibility = cipher.Shared ? ViewStates.Visible : ViewStates.Gone;
+            AttachmentsIcon.Visibility = cipher.HasAttachments ? ViewStates.Visible : ViewStates.Gone;
+        }
+
+        public void UpdateIconImage(CipherViewCell cipherCell)
         {
             if(_currentTask != null && !_currentTask.IsCancelled && !_currentTask.IsCompleted)
             {
@@ -128,19 +151,6 @@ namespace Bit.Droid.Renderers
                 Icon.Visibility = ViewStates.Visible;
                 Icon.Text = iconImage.Item1;
             }
-
-            Name.Text = cipher.Name;
-            if(!string.IsNullOrWhiteSpace(cipher.SubTitle))
-            {
-                SubTitle.Text = cipher.SubTitle;
-                SubTitle.Visibility = ViewStates.Visible;
-            }
-            else
-            {
-                SubTitle.Visibility = ViewStates.Gone;
-            }
-            SharedIcon.Visibility = cipher.Shared ? ViewStates.Visible : ViewStates.Gone;
-            AttachmentsIcon.Visibility = cipher.HasAttachments ? ViewStates.Visible : ViewStates.Gone;
         }
     }
 

src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs

@@ -14,6 +14,9 @@ namespace Bit.App.Controls
         public static readonly BindableProperty CipherProperty = BindableProperty.Create(
             nameof(Cipher), typeof(CipherView), typeof(CipherViewCell), default(CipherView), BindingMode.OneWay);
 
+        public static readonly BindableProperty WebsiteIconsEnabledProperty = BindableProperty.Create(
+            nameof(WebsiteIconsEnabled), typeof(bool), typeof(CipherViewCell), true, BindingMode.OneWay);
+
         public static readonly BindableProperty ButtonCommandProperty = BindableProperty.Create(
             nameof(ButtonCommand), typeof(Command<CipherView>), typeof(CipherViewCell));
 
@@ -36,7 +39,11 @@ namespace Bit.App.Controls
             }
         }
 
-        public bool WebsiteIconsEnabled { get; set; } = true;
+        public bool WebsiteIconsEnabled
+        {
+            get => (bool)GetValue(WebsiteIconsEnabledProperty);
+            set => SetValue(WebsiteIconsEnabledProperty, value);
+        }
 
         public CipherView Cipher
         {

src/App/Pages/Vault/AutofillCiphersPage.xaml

@@ -26,7 +26,8 @@
                           x:DataType="pages:GroupingsPageListItem">
                 <controls:CipherViewCell
                     Cipher="{Binding Cipher}"
-                    ButtonCommand="{Binding BindingContext.CipherOptionsCommand, Source={x:Reference _page}}" />
+                    ButtonCommand="{Binding BindingContext.CipherOptionsCommand, Source={x:Reference _page}}"
+                    WebsiteIconsEnabled="{Binding BindingContext.WebsiteIconsEnabled, Source={x:Reference _page}}" />
             </DataTemplate>
 
             <pages:GroupingsPageListItemSelector x:Key="listItemDataTemplateSelector"

src/App/Pages/Vault/AutofillCiphersPageViewModel.cs

@@ -22,16 +22,19 @@ namespace Bit.App.Pages
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IDeviceActionService _deviceActionService;
         private readonly ICipherService _cipherService;
+        private readonly IStateService _stateService;
 
         private AppOptions _appOptions;
         private bool _showList;
         private string _noDataText;
+        private bool _websiteIconsEnabled;
 
         public AutofillCiphersPageViewModel()
         {
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
 
             GroupedItems = new ExtendedObservableCollection<GroupingsPageListGroup>();
             CipherOptionsCommand = new Command<CipherView>(CipherOptionsAsync);
@@ -53,6 +56,11 @@ namespace Bit.App.Pages
             get => _noDataText;
             set => SetProperty(ref _noDataText, value);
         }
+        public bool WebsiteIconsEnabled
+        {
+            get => _websiteIconsEnabled;
+            set => SetProperty(ref _websiteIconsEnabled, value);
+        }
 
         public void Init(AppOptions appOptions)
         {
@@ -78,6 +86,8 @@ namespace Bit.App.Pages
 
         public async Task LoadAsync()
         {
+            WebsiteIconsEnabled = !(await _stateService.GetAsync<bool?>(Constants.DisableFaviconKey))
+                .GetValueOrDefault();
             ShowList = false;
             var groupedItems = new List<GroupingsPageListGroup>();
             var ciphers = await _cipherService.GetAllDecryptedByUrlAsync(Uri, null);

src/App/Pages/Vault/CiphersPage.xaml

@@ -69,7 +69,9 @@
                 <DataTemplate x:DataType="views:CipherView">
                     <controls:CipherViewCell
                         Cipher="{Binding .}"
-                        ButtonCommand="{Binding BindingContext.CipherOptionsCommand, Source={x:Reference _page}}" />
+                        ButtonCommand="{Binding BindingContext.CipherOptionsCommand, Source={x:Reference _page}}"
+                        WebsiteIconsEnabled="{Binding BindingContext.WebsiteIconsEnabled, Source={x:Reference _page}}"
+                        />
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>

src/App/Pages/Vault/CiphersPage.xaml.cs

@@ -45,9 +45,10 @@ namespace Bit.App.Pages
 
         public SearchBar SearchBar => _searchBar;
 
-        protected override void OnAppearing()
+        protected async override void OnAppearing()
         {
             base.OnAppearing();
+            await _vm.InitAsync();
             if(!_hasFocused)
             {
                 _hasFocused = true;

src/App/Pages/Vault/CiphersPageViewModel.cs

@@ -1,5 +1,6 @@
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
@@ -20,10 +21,12 @@ namespace Bit.App.Pages
         private readonly ICipherService _cipherService;
         private readonly ISearchService _searchService;
         private readonly IDeviceActionService _deviceActionService;
+        private readonly IStateService _stateService;
         private CancellationTokenSource _searchCancellationTokenSource;
 
         private bool _showNoData;
         private bool _showList;
+        private bool _websiteIconsEnabled;
 
         public CiphersPageViewModel()
         {
@@ -31,6 +34,7 @@ namespace Bit.App.Pages
             _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
             _searchService = ServiceContainer.Resolve<ISearchService>("searchService");
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
 
             Ciphers = new ExtendedObservableCollection<CipherView>();
             CipherOptionsCommand = new Command<CipherView>(CipherOptionsAsync);
@@ -61,6 +65,18 @@ namespace Bit.App.Pages
 
         public bool ShowSearchDirection => !ShowList && !ShowNoData;
 
+        public bool WebsiteIconsEnabled
+        {
+            get => _websiteIconsEnabled;
+            set => SetProperty(ref _websiteIconsEnabled, value);
+        }
+
+        public async Task InitAsync()
+        {
+            WebsiteIconsEnabled = !(await _stateService.GetAsync<bool?>(Constants.DisableFaviconKey))
+                .GetValueOrDefault();
+        }
+
         public void Search(string searchText, int? timeout = null)
         {
             var previousCts = _searchCancellationTokenSource;

src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml

@@ -33,7 +33,8 @@
                           x:DataType="pages:GroupingsPageListItem">
                 <controls:CipherViewCell
                     Cipher="{Binding Cipher}"
-                    ButtonCommand="{Binding BindingContext.CipherOptionsCommand, Source={x:Reference _page}}" />
+                    ButtonCommand="{Binding BindingContext.CipherOptionsCommand, Source={x:Reference _page}}"
+                    WebsiteIconsEnabled="{Binding BindingContext.WebsiteIconsEnabled, Source={x:Reference _page}}" />
             </DataTemplate>
 
             <DataTemplate x:Key="groupTemplate"

src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs

@@ -1,6 +1,7 @@
 using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.App.Utilities;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Models.Domain;
@@ -25,6 +26,7 @@ namespace Bit.App.Pages
         private bool _showAddCipherButton;
         private bool _showNoData;
         private bool _showList;
+        private bool _websiteIconsEnabled;
         private string _noDataText;
         private List<CipherView> _allCiphers;
         private Dictionary<string, int> _folderCounts = new Dictionary<string, int>();
@@ -38,6 +40,7 @@ namespace Bit.App.Pages
         private readonly IDeviceActionService _deviceActionService;
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IMessagingService _messagingService;
+        private readonly IStateService _stateService;
 
         public GroupingsPageViewModel()
         {
@@ -48,6 +51,7 @@ namespace Bit.App.Pages
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
 
             Loading = true;
             PageTitle = AppResources.MyVault;
@@ -114,6 +118,11 @@ namespace Bit.App.Pages
             get => _showList;
             set => SetProperty(ref _showList, value);
         }
+        public bool WebsiteIconsEnabled
+        {
+            get => _websiteIconsEnabled;
+            set => SetProperty(ref _websiteIconsEnabled, value);
+        }
         public ExtendedObservableCollection<GroupingsPageListGroup> GroupedItems { get; set; }
         public Command RefreshCommand { get; set; }
         public Command<CipherView> CipherOptionsCommand { get; set; }
@@ -132,6 +141,8 @@ namespace Bit.App.Pages
             var groupedItems = new List<GroupingsPageListGroup>();
             var page = Page as GroupingsPage;
 
+            WebsiteIconsEnabled = !(await _stateService.GetAsync<bool?>(Constants.DisableFaviconKey))
+                .GetValueOrDefault();
             try
             {
                 await LoadDataAsync();