Upstream/bitwarden-mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile.git synced 2025-02-25 02:41:26 +01:00
Code Issues Projects Releases Wiki Activity

Apply Disable Favicon setting globally to match desktop (#1811)

Browse Source 
* Apply Disable Favicon setting globally to match desktop

* streamline the approach to applying global settings
This commit is contained in:
Matt Portune 2022-02-24 17:13:00 -05:00 committed by GitHub
parent be993bcd02
commit f94812719d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/App/Pages/Settings/OptionsPageViewModel.cs
View File

@ -206,7 +206,6 @@ namespace Bit.App.Pages
await _stateService.SetThemeAsync(theme); await _stateService.SetThemeAsync(theme);
ThemeManager.SetTheme(Application.Current.Resources); ThemeManager.SetTheme(Application.Current.Resources);
_messagingService.Send("updatedTheme"); _messagingService.Send("updatedTheme");
_stateService.ApplyThemeGloballyAsync(theme).FireAndForget();
} }
} }

1
src/Core/Abstractions/IStateService.cs
View File

@ -106,7 +106,6 @@ namespace Bit.Core.Abstractions
Task SetRememberedOrgIdentifierAsync(string value); Task SetRememberedOrgIdentifierAsync(string value);
Task<string> GetThemeAsync(string userId = null); Task<string> GetThemeAsync(string userId = null);
Task SetThemeAsync(string value, string userId = null); Task SetThemeAsync(string value, string userId = null);
Task ApplyThemeGloballyAsync(string value);
Task<bool?> GetAddSitePromptShownAsync(string userId = null); Task<bool?> GetAddSitePromptShownAsync(string userId = null);
Task SetAddSitePromptShownAsync(bool? value, string userId = null); Task SetAddSitePromptShownAsync(bool? value, string userId = null);
Task<bool?> GetPushInitialPromptShownAsync(); Task<bool?> GetPushInitialPromptShownAsync();

43
src/Core/Services/StateService.cs
View File

@ -579,6 +579,9 @@ namespace Bit.Core.Services
await GetDefaultStorageOptionsAsync()); await GetDefaultStorageOptionsAsync());
var key = Constants.DisableFaviconKey(reconciledOptions.UserId); var key = Constants.DisableFaviconKey(reconciledOptions.UserId);
await SetValueAsync(key, value, reconciledOptions); await SetValueAsync(key, value, reconciledOptions);
// TODO remove this to restore per-account DisableFavicon support
SetValueGloballyAsync(Constants.DisableFaviconKey, value, reconciledOptions).FireAndForget();
} }
public async Task<bool?> GetDisableAutoTotpCopyAsync(string userId = null) public async Task<bool?> GetDisableAutoTotpCopyAsync(string userId = null)
@ -863,26 +866,9 @@ namespace Bit.Core.Services
await GetDefaultStorageOptionsAsync()); await GetDefaultStorageOptionsAsync());
var key = Constants.ThemeKey(reconciledOptions.UserId); var key = Constants.ThemeKey(reconciledOptions.UserId);
await SetValueAsync(key, value, reconciledOptions); await SetValueAsync(key, value, reconciledOptions);
}
public async Task ApplyThemeGloballyAsync(string value) // TODO remove this to restore per-account Theme support
{ SetValueGloballyAsync(Constants.ThemeKey, value, reconciledOptions).FireAndForget();
// TODO remove this method (ApplyThemeGlobally) to restore per-account theme support
await CheckStateAsync();
if (_state?.Accounts == null)
{
return;
}
var activeUserId = await GetActiveUserIdAsync();
foreach (var account in _state.Accounts)
{
var uid = account.Value?.Profile?.UserId;
// skip active user (theme already set)
if (uid != null && uid != activeUserId)
{
await SetThemeAsync(value, uid);
}
}
} }
public async Task<bool?> GetAddSitePromptShownAsync(string userId = null) public async Task<bool?> GetAddSitePromptShownAsync(string userId = null)
@ -1185,6 +1171,25 @@ namespace Bit.Core.Services
await GetStorageService(options).SaveAsync(key, value); await GetStorageService(options).SaveAsync(key, value);
} }
private async Task SetValueGloballyAsync<T>(Func<string, string> keyPrefix, T value, StorageOptions options)
{
await CheckStateAsync();
if (_state?.Accounts == null)
{
return;
}
// userId from options was already applied, skip those
var userIdToSkip = options.UserId;
foreach (var account in _state.Accounts)
{
var uid = account.Value?.Profile?.UserId;
if (uid != null && uid != userIdToSkip)
{
await SetValueAsync(keyPrefix(uid), value, options);
}
}
}
private IStorageService GetStorageService(StorageOptions options) private IStorageService GetStorageService(StorageOptions options)
{ {
return options.UseSecureStorage.GetValueOrDefault(false) ? _secureStorageService : _storageService; return options.UseSecureStorage.GetValueOrDefault(false) ? _secureStorageService : _storageService;