From 849a0c24b08653d82904db1ef85a649ad7f72685 Mon Sep 17 00:00:00 2001 From: Vince Grassia <593223+vgrassia@users.noreply.github.com> Date: Wed, 24 Jan 2024 10:05:30 -0500 Subject: [PATCH 1/3] Update Renovate config (#2953) --- .github/renovate.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/renovate.json b/.github/renovate.json index cd01c8c00..2f6fafa4a 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -2,6 +2,7 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "config:base", + "github>bitwarden/renovate-config:pin-actions", ":combinePatchMinorReleases", ":dependencyDashboard", ":maintainLockFilesWeekly", From f3537b1a746db5258619a980f24755475ec1c4ab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 10:07:10 -0500 Subject: [PATCH 2/3] [deps]: Update gh minor (#2544) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 10 +++++----- .github/workflows/crowdin-pull.yml | 6 +++--- .github/workflows/release.yml | 12 ++++++------ .github/workflows/version-auto-bump.yml | 2 +- .github/workflows/version-bump.yml | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 320683cfa..1ecae5a49 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -147,7 +147,7 @@ jobs: run: dotnet test test/Core.Test/Core.Test.csproj --logger "trx;LogFileName=test-results.trx" - name: Report test results - uses: dorny/test-reporter@c9b3d0e2bd2a4e96aaf424dbaa31c46b42318226 # v1.6.0 + uses: dorny/test-reporter@afe6793191b75b608954023a46831a3fe10048d4 # v1.7.0 if: always() with: name: Test Results @@ -491,7 +491,7 @@ jobs: submodules: 'true' - name: Login to Azure - CI Subscription - uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6 + uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0 with: creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }} @@ -756,7 +756,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Login to Azure - CI Subscription - uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6 + uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0 with: creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }} @@ -768,7 +768,7 @@ jobs: secrets: "crowdin-api-token" - name: Upload Sources - uses: crowdin/github-action@965d501f160af7b1f88aed4c29154b0caf1e94b9 # v1.9.0 + uses: crowdin/github-action@6fb7e99759b996fd142995636fd8c88c1fb8ecd9 # v1.16.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }} @@ -815,7 +815,7 @@ jobs: fi - name: Login to Azure - CI Subscription - uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6 + uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0 if: failure() with: creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }} diff --git a/.github/workflows/crowdin-pull.yml b/.github/workflows/crowdin-pull.yml index 7e90341a6..5da9478ae 100644 --- a/.github/workflows/crowdin-pull.yml +++ b/.github/workflows/crowdin-pull.yml @@ -15,10 +15,10 @@ jobs: _CROWDIN_PROJECT_ID: "269690" steps: - name: Checkout repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 - name: Login to Azure - CI Subscription - uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6 + uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0 with: creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }} @@ -30,7 +30,7 @@ jobs: secrets: "crowdin-api-token, github-gpg-private-key, github-gpg-private-key-passphrase" - name: Download translations - uses: crowdin/github-action@965d501f160af7b1f88aed4c29154b0caf1e94b9 # v1.9.0 + uses: crowdin/github-action@6fb7e99759b996fd142995636fd8c88c1fb8ecd9 # v1.16.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c080d2752..95dc4f463 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: fi - name: Checkout repo - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 - name: Check Release Version id: version @@ -68,7 +68,7 @@ jobs: - name: Download all artifacts if: ${{ github.event.inputs.release_type != 'Dry Run' }} - uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615 # v2.27.0 + uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e # v2.28.0 with: workflow: build.yml workflow_conclusion: success @@ -76,7 +76,7 @@ jobs: - name: Dry Run - Download all artifacts if: ${{ github.event.inputs.release_type == 'Dry Run' }} - uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615 # v2.27.0 + uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e # v2.28.0 with: workflow: build.yml workflow_conclusion: success @@ -126,11 +126,11 @@ jobs: if: inputs.fdroid_publish steps: - name: Checkout repo - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 - name: Download F-Droid .apk artifact if: ${{ github.event.inputs.release_type != 'Dry Run' }} - uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615 # v2.27.0 + uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e # v2.28.0 with: workflow: build.yml workflow_conclusion: success @@ -139,7 +139,7 @@ jobs: - name: Dry Run - Download F-Droid .apk artifact if: ${{ github.event.inputs.release_type == 'Dry Run' }} - uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615 # v2.27.0 + uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e # v2.28.0 with: workflow: build.yml workflow_conclusion: success diff --git a/.github/workflows/version-auto-bump.yml b/.github/workflows/version-auto-bump.yml index dc7a16f1e..88b86acbd 100644 --- a/.github/workflows/version-auto-bump.yml +++ b/.github/workflows/version-auto-bump.yml @@ -14,7 +14,7 @@ jobs: version_number: ${{ steps.version.outputs.new-version }} steps: - name: Checkout Branch - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 - name: Calculate bumped version id: version diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index 1f58ffc55..92d7fe374 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Login to Azure - CI Subscription - uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7 + uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0 with: creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }} @@ -33,7 +33,7 @@ jobs: github-pat-bitwarden-devops-bot-repo-scope" - name: Checkout Branch - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: ref: main repository: bitwarden/mobile From 3f10a6be241afaf251fba7d22d39a296b8858dac Mon Sep 17 00:00:00 2001 From: mpbw2 <59324545+mpbw2@users.noreply.github.com> Date: Wed, 24 Jan 2024 15:07:39 -0500 Subject: [PATCH 3/3] Add privacy policy link to about screen (#2954) --- src/App/Pages/Settings/AboutSettingsPage.xaml | 4 ++-- .../Settings/AboutSettingsPageViewModel.cs | 10 +++++----- src/App/Resources/AppResources.Designer.cs | 18 ++++++++++++++++++ src/App/Resources/AppResources.resx | 6 ++++++ src/Core/ExternalLinksConstants.cs | 2 +- 5 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/App/Pages/Settings/AboutSettingsPage.xaml b/src/App/Pages/Settings/AboutSettingsPage.xaml index 8a9cd9646..51bc10aee 100644 --- a/src/App/Pages/Settings/AboutSettingsPage.xaml +++ b/src/App/Pages/Settings/AboutSettingsPage.xaml @@ -31,8 +31,8 @@ diff --git a/src/App/Pages/Settings/AboutSettingsPageViewModel.cs b/src/App/Pages/Settings/AboutSettingsPageViewModel.cs index 1866d368d..a37168a0e 100644 --- a/src/App/Pages/Settings/AboutSettingsPageViewModel.cs +++ b/src/App/Pages/Settings/AboutSettingsPageViewModel.cs @@ -36,10 +36,10 @@ namespace Bit.App.Pages AppResources.ContinueToHelpCenter, ExternalLinksConstants.HELP_CENTER)); - ContactBitwardenSupportCommand = CreateDefaultAsyncCommnad( - () => LaunchUriAsync(AppResources.ContactSupportDescriptionLong, - AppResources.ContinueToContactSupport, - ExternalLinksConstants.CONTACT_SUPPORT)); + GoToPrivacyPolicyCommand = CreateDefaultAsyncCommnad( + () => LaunchUriAsync(AppResources.PrivacyPolicyDescriptionLong, + AppResources.ContinueToPrivacyPolicy, + ExternalLinksConstants.PRIVACY_POLICY)); GoToWebVaultCommand = CreateDefaultAsyncCommnad( () => LaunchUriAsync(AppResources.ExploreMoreFeaturesOfYourBitwardenAccountOnTheWebApp, @@ -82,7 +82,7 @@ namespace Bit.App.Pages public AsyncCommand ToggleSubmitCrashLogsCommand { get; } public ICommand GoToHelpCenterCommand { get; } - public ICommand ContactBitwardenSupportCommand { get; } + public ICommand GoToPrivacyPolicyCommand { get; } public ICommand GoToWebVaultCommand { get; } public ICommand GoToLearnAboutOrgsCommand { get; } public ICommand RateTheAppCommand { get; } diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs index 628efaf07..11eecb7f9 100644 --- a/src/App/Resources/AppResources.Designer.cs +++ b/src/App/Resources/AppResources.Designer.cs @@ -1714,6 +1714,15 @@ namespace Bit.App.Resources { } } + /// + /// Looks up a localized string similar to Continue to privacy policy?. + /// + public static string ContinueToPrivacyPolicy { + get { + return ResourceManager.GetString("ContinueToPrivacyPolicy", resourceCulture); + } + } + /// /// Looks up a localized string similar to Continue to web app?. /// @@ -5516,6 +5525,15 @@ namespace Bit.App.Resources { } } + /// + /// Looks up a localized string similar to Check out our privacy policy on bitwarden.com.. + /// + public static string PrivacyPolicyDescriptionLong { + get { + return ResourceManager.GetString("PrivacyPolicyDescriptionLong", resourceCulture); + } + } + /// /// Looks up a localized string similar to Bitwarden keeps your vault automatically synced by using push notifications. For the best possible experience, please select "Allow" on the following prompt when asked to allow push notifications.. /// diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx index 4efdb26f7..6c8f38dd4 100644 --- a/src/App/Resources/AppResources.resx +++ b/src/App/Resources/AppResources.resx @@ -2821,6 +2821,9 @@ Do you want to switch to this account? Continue to contact support? + + Continue to privacy policy? + Continue to app store? @@ -2840,6 +2843,9 @@ Do you want to switch to this account? Can’t find what you are looking for? Reach out to Bitwarden support on bitwarden.com. + + Check out our privacy policy on bitwarden.com. + Explore more features of your Bitwarden account on the web app. diff --git a/src/Core/ExternalLinksConstants.cs b/src/Core/ExternalLinksConstants.cs index 6db6292a2..ff0b09176 100644 --- a/src/Core/ExternalLinksConstants.cs +++ b/src/Core/ExternalLinksConstants.cs @@ -6,7 +6,7 @@ public const string HELP_ABOUT_ORGANIZATIONS = "https://bitwarden.com/help/about-organizations/"; public const string HELP_FINGERPRINT_PHRASE = "https://bitwarden.com/help/fingerprint-phrase/"; - public const string CONTACT_SUPPORT = "https://bitwarden.com/contact/"; + public const string PRIVACY_POLICY = "https://bitwarden.com/privacy/"; /// /// Link to go to settings website. Requires to pass website URL as parameter.