mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-01-13 11:47:33 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into feature/maui-migration

Browse source
This commit is contained in:
Federico Maccaroni 2024-01-17 13:22:26 -03:00
commit 66f0471f2e
No known key found for this signature in database
GPG key ID: 5D233F8F2B034536
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Core/ExternalLinksConstants.cs
View file

@ -13,6 +13,11 @@
/// </summary>
public const string WEB_VAULT_SETTINGS_FORMAT = "{0}/#/settings";
/// <summary>
/// Link to go to individual vault import page. Requires to pass vault URL as parameter.
/// </summary>
public const string WEB_VAULT_TOOLS_IMPORT_FORMAT = "{0}/#/tools/import";
/// <summary>
/// General website, not in the full format of a URL given that this is used as parameter of string resources to be shown to the user.
/// </summary>

6
src/Core/Pages/Settings/VaultSettingsPageViewModel.cs
View file

@ -41,11 +41,11 @@ namespace Bit.App.Pages
private async Task GoToImportItemsAsync()
{
var webVaultUrl = _environmentService.GetWebVaultUrl();
var body = string.Format(AppResources.YouCanImportDataToYourVaultOnX, webVaultUrl);
var toolsImportUrl = string.Format(ExternalLinksConstants.WEB_VAULT_TOOLS_IMPORT_FORMAT, _environmentService.GetWebVaultUrl());
var body = string.Format(AppResources.YouCanImportDataToYourVaultOnX, toolsImportUrl);
if (await _platformUtilsService.ShowDialogAsync(body, AppResources.ContinueToWebApp, AppResources.Continue, AppResources.Cancel))
{
_platformUtilsService.LaunchUri(webVaultUrl);
_platformUtilsService.LaunchUri(toolsImportUrl);
}
}
}