Fix Android build (#2029)

Change worker to win-2022 for VS2022

(cherry picked from commit 94bd5ceed3)

.github/workflows/build.yml

@@ -57,7 +57,7 @@ jobs:
 
   android:
     name: Android
-    runs-on: windows-2019
+    runs-on: windows-2022
     needs: setup
     steps:
       - name: Setup NuGet
@@ -212,7 +212,7 @@ jobs:
 
   f-droid:
     name: F-Droid Build
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Setup NuGet
         uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa  # v1.0.6

.github/workflows/release.yml

@@ -54,17 +54,26 @@ jobs:
           echo "::set-output name=branch-name::$BRANCH_NAME"
 
       - name: Download all artifacts
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
         with:
           workflow: build.yml
           workflow_conclusion: success
           branch: ${{ steps.branch.outputs.branch-name }}
 
+      - name: Download all artifacts
+        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
+        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
+        with:
+          workflow: build.yml
+          workflow_conclusion: success
+          branch: master
+
       - name: Prep Bitwarden iOS release asset
         run: zip -r Bitwarden\ iOS.zip Bitwarden\ iOS
 
       - name: Create release
-        if: github.event.inputs.release_type != 'Dry Run'
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         uses: ncipollo/release-action@40bb172bd05f266cf9ba4ff965cb61e9ee5f6d01  # v1.9.0
         with:
           artifacts: "./com.x8bit.bitwarden.aab/com.x8bit.bitwarden.aab,
@@ -89,6 +98,7 @@ jobs:
         uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
 
       - name: Download F-Droid .apk artifact
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
         with:
           workflow: build.yml
@@ -96,6 +106,15 @@ jobs:
           branch: ${{ needs.release.outputs.branch-name }}
           name: com.x8bit.bitwarden-fdroid.apk
 
+      - name: Download F-Droid .apk artifact
+        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
+        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
+        with:
+          workflow: build.yml
+          workflow_conclusion: success
+          branch: master
+          name: com.x8bit.bitwarden-fdroid.apk
+
       - name: Set up Node
         uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561  # v2.5.1
         with:
@@ -161,5 +180,5 @@ jobs:
           cd $GITHUB_WORKSPACE
 
       - name: Deploy to gh-pages
-        if: github.event.inputs.release_type != 'Dry Run'
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         run: npm run deploy

src/Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2022.6.2" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2022.8.0" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
 

src/App/Pages/Accounts/EnvironmentPageViewModel.cs

@@ -70,7 +70,7 @@ namespace Bit.App.Pages
         {
             bool IsUrlValid(string url)
             {
-                return string.IsNullOrEmpty(url) || Uri.IsWellFormedUriString(url, UriKind.Absolute);
+                return string.IsNullOrEmpty(url) || Uri.IsWellFormedUriString(url, UriKind.RelativeOrAbsolute);
             }
 
             return IsUrlValid(BaseUrl)

src/App/Pages/Settings/OptionsPage.xaml

@@ -132,20 +132,20 @@
             <StackLayout StyleClass="box" IsVisible="{Binding ShowAndroidAutofillSettings}">
                 <StackLayout StyleClass="box-row, box-row-input">
                     <Label
-                        Text="{u:I18n BlacklistedUris}"
+                        Text="{u:I18n AutofillBlockedUris}"
                         StyleClass="box-label" />
                     <Editor
-                        x:Name="_blacklistedUrisEditor"
-                        Text="{Binding AutofillBlacklistedUris}"
+                        x:Name="_autofillBlockedUrisEditor"
+                        Text="{Binding AutofillBlockedUris}"
                         StyleClass="box-value"
                         AutoSize="TextChanges"
                         IsSpellCheckEnabled="False"
                         IsTextPredictionEnabled="False"
                         Keyboard="Url"
-                        Unfocused="BlacklistedUrisEditor_Unfocused" />
+                        Unfocused="AutofillBlockedUrisEditor_Unfocused" />
                 </StackLayout>
                 <Label
-                    Text="{u:I18n BlacklistedUrisDescription}"
+                    Text="{u:I18n AutofillBlockedUrisDescription}"
                     StyleClass="box-footer-label" />
             </StackLayout>
         </StackLayout>

src/App/Pages/Settings/OptionsPage.xaml.cs

@@ -45,12 +45,12 @@ namespace Bit.App.Pages
         protected async override void OnDisappearing()
         {
             base.OnDisappearing();
-            await _vm.UpdateAutofillBlacklistedUris();
+            await _vm.UpdateAutofillBlockedUris();
         }
 
-        private async void BlacklistedUrisEditor_Unfocused(object sender, FocusEventArgs e)
+        private async void AutofillBlockedUrisEditor_Unfocused(object sender, FocusEventArgs e)
         {
-            await _vm.UpdateAutofillBlacklistedUris();
+            await _vm.UpdateAutofillBlockedUris();
         }
 
         private async void Close_Clicked(object sender, System.EventArgs e)

src/App/Pages/Settings/OptionsPageViewModel.cs

@@ -17,7 +17,7 @@ namespace Bit.App.Pages
 
 
         private bool _autofillSavePrompt;
-        private string _autofillBlacklistedUris;
+        private string _autofillBlockedUris;
         private bool _favicon;
         private bool _autoTotpCopy;
         private int _clearClipboardSelectedIndex;
@@ -167,10 +167,10 @@ namespace Bit.App.Pages
             }
         }
 
-        public string AutofillBlacklistedUris
+        public string AutofillBlockedUris
         {
-            get => _autofillBlacklistedUris;
-            set => SetProperty(ref _autofillBlacklistedUris, value);
+            get => _autofillBlockedUris;
+            set => SetProperty(ref _autofillBlockedUris, value);
         }
 
         public bool ShowAndroidAutofillSettings
@@ -182,8 +182,8 @@ namespace Bit.App.Pages
         public async Task InitAsync()
         {
             AutofillSavePrompt = !(await _stateService.GetAutofillDisableSavePromptAsync()).GetValueOrDefault();
-            var blacklistedUrisList = await _stateService.GetAutofillBlacklistedUrisAsync();
-            AutofillBlacklistedUris = blacklistedUrisList != null ? string.Join(", ", blacklistedUrisList) : null;
+            var blockedUrisList = await _stateService.GetAutofillBlacklistedUrisAsync();
+            AutofillBlockedUris = blockedUrisList != null ? string.Join(", ", blockedUrisList) : null;
             AutoTotpCopy = !(await _stateService.GetDisableAutoTotpCopyAsync() ?? false);
             Favicon = !(await _stateService.GetDisableFaviconAsync()).GetValueOrDefault();
             var theme = await _stateService.GetThemeAsync();
@@ -252,19 +252,19 @@ namespace Bit.App.Pages
             }
         }
 
-        public async Task UpdateAutofillBlacklistedUris()
+        public async Task UpdateAutofillBlockedUris()
         {
             if (_inited)
             {
-                if (string.IsNullOrWhiteSpace(AutofillBlacklistedUris))
+                if (string.IsNullOrWhiteSpace(AutofillBlockedUris))
                 {
                     await _stateService.SetAutofillBlacklistedUrisAsync(null);
-                    AutofillBlacklistedUris = null;
+                    AutofillBlockedUris = null;
                     return;
                 }
                 try
                 {
-                    var csv = AutofillBlacklistedUris;
+                    var csv = AutofillBlockedUris;
                     var urisList = new List<string>();
                     foreach (var uri in csv.Split(','))
                     {
@@ -281,7 +281,7 @@ namespace Bit.App.Pages
                         urisList.Add(cleanedUri);
                     }
                     await _stateService.SetAutofillBlacklistedUrisAsync(urisList);
-                    AutofillBlacklistedUris = string.Join(", ", urisList);
+                    AutofillBlockedUris = string.Join(", ", urisList);
                 }
                 catch { }
             }

src/App/Pages/Settings/SettingsPage/SettingsPageListItem.cs

@@ -15,7 +15,7 @@ namespace Bit.App.Pages
         public bool UseFrame { get; set; }
         public Func<Task> ExecuteAsync { get; set; }
 
-        public bool SubLabelTextEnabled => SubLabel == AppResources.Enabled;
+        public bool SubLabelTextEnabled => SubLabel == AppResources.On;
         public string LineBreakMode => SubLabel == null ? "TailTruncation" : "";
         public bool ShowSubLabel => SubLabel.Length != 0;
         public bool ShowTimeInput => Time != null;

src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs

@@ -450,7 +450,7 @@ namespace Bit.App.Pages
                 autofillItems.Add(new SettingsPageListItem
                 {
                     Name = AppResources.AutofillServices,
-                    SubLabel = _deviceActionService.AutofillServicesEnabled() ? AppResources.Enabled : AppResources.Disabled,
+                    SubLabel = _deviceActionService.AutofillServicesEnabled() ? AppResources.On : AppResources.Off,
                     ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new AutofillServicesPage(Page as SettingsPage)))
                 });
             }
@@ -500,7 +500,7 @@ namespace Bit.App.Pages
                 new SettingsPageListItem
                 {
                     Name = AppResources.UnlockWithPIN,
-                    SubLabel = _pin ? AppResources.Enabled : AppResources.Disabled,
+                    SubLabel = _pin ? AppResources.On : AppResources.Off,
                     ExecuteAsync = () => UpdatePinAsync()
                 },
                 new SettingsPageListItem
@@ -525,7 +525,7 @@ namespace Bit.App.Pages
                 var item = new SettingsPageListItem
                 {
                     Name = string.Format(AppResources.UnlockWith, biometricName),
-                    SubLabel = _biometric ? AppResources.Enabled : AppResources.Disabled,
+                    SubLabel = _biometric ? AppResources.On : AppResources.Off,
                     ExecuteAsync = () => UpdateBiometricAsync()
                 };
                 securityItems.Insert(2, item);
@@ -554,7 +554,7 @@ namespace Bit.App.Pages
                 securityItems.Add(new SettingsPageListItem
                 {
                     Name = AppResources.AllowScreenCapture,
-                    SubLabel = _screenCaptureAllowed ? AppResources.Enabled : AppResources.Disabled,
+                    SubLabel = _screenCaptureAllowed ? AppResources.On : AppResources.Off,
                     ExecuteAsync = () => SetScreenCaptureAllowedAsync()
                 });
             }
@@ -627,7 +627,7 @@ namespace Bit.App.Pages
                 new SettingsPageListItem
                 {
                     Name = AppResources.SubmitCrashLogs,
-                    SubLabel = _reportLoggingEnabled ? AppResources.Enabled : AppResources.Disabled,
+                    SubLabel = _reportLoggingEnabled ? AppResources.On : AppResources.Off,
                     ExecuteAsync = () => LoggerReportingAsync()
                 },
 #endif

src/App/Pages/Vault/ViewPage.xaml

@@ -571,6 +571,8 @@
                                                 IsVisible="{Binding IsLinkedType}" />
                                             <controls:IconLabel
                                                 Text="{Binding ValueText, Mode=OneWay}"
+                                                AutomationProperties.IsInAccessibleTree="true"
+                                                AutomationProperties.Name="{Binding ValueAccessibilityText, Mode=OneWay}"
                                                 StyleClass="box-value"
                                                 Grid.Row="1"
                                                 Grid.Column="0"

src/App/Pages/Vault/ViewPageViewModel.cs

@@ -727,6 +727,7 @@ namespace Bit.App.Pages
                 additionalPropertyNames: new string[]
                 {
                     nameof(ValueText),
+                    nameof(ValueAccessibilityText),
                     nameof(IsBooleanType),
                     nameof(IsHiddenType),
                     nameof(IsTextType),
@@ -750,7 +751,7 @@ namespace Bit.App.Pages
             {
                 if (IsBooleanType)
                 {
-                    return _field.Value == "true" ? BitwardenIcons.CheckSquare : BitwardenIcons.Square;
+                    return _field.BoolValue ? BitwardenIcons.CheckSquare : BitwardenIcons.Square;
                 }
                 else if (IsLinkedType)
                 {
@@ -764,6 +765,19 @@ namespace Bit.App.Pages
             }
         }
 
+        public string ValueAccessibilityText
+        {
+            get
+            {
+                if (IsBooleanType)
+                {
+                    return _field.BoolValue ? AppResources.Enabled : AppResources.Disabled;
+                }
+
+                return ValueText;
+            }
+        }
+
         public FormattedString ColoredHiddenValue => PasswordFormatter.FormatPassword(_field.Value);
 
         public Command ToggleHiddenValueCommand { get; set; }

src/App/Resources/AppResources.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -418,7 +418,7 @@
     <value>Use the Bitwarden accessibility service to auto-fill your logins across apps and the web.</value>
   </data>
   <data name="AutofillService" xml:space="preserve">
-    <value>Auto-fill Service</value>
+    <value>Auto-fill service</value>
   </data>
   <data name="AvoidAmbiguousCharacters" xml:space="preserve">
     <value>Avoid Ambiguous Characters</value>
@@ -445,7 +445,7 @@
     <value>You can change your email address on the bitwarden.com web vault. Do you want to visit the website now?</value>
   </data>
   <data name="ChangeMasterPassword" xml:space="preserve">
-    <value>Change Master Password</value>
+    <value>Change master password</value>
   </data>
   <data name="ChangePasswordConfirmation" xml:space="preserve">
     <value>You can change your master password on the bitwarden.com web vault. Do you want to visit the website now?</value>
@@ -473,13 +473,13 @@
     <value>Enter your account email address to receive your master password hint.</value>
   </data>
   <data name="ExntesionReenable" xml:space="preserve">
-    <value>Re-enable App Extension</value>
+    <value>Re-enable app extension</value>
   </data>
   <data name="ExtensionAlmostDone" xml:space="preserve">
     <value>Almost done!</value>
   </data>
   <data name="ExtensionEnable" xml:space="preserve">
-    <value>Enable App Extension</value>
+    <value>Enable app extension</value>
   </data>
   <data name="ExtensionInSafari" xml:space="preserve">
     <value>In Safari, find Bitwarden using the share icon (hint: scroll to the right on the bottom row of the menu).</value>
@@ -694,7 +694,7 @@
     <value>Syncing failed.</value>
   </data>
   <data name="SyncVaultNow" xml:space="preserve">
-    <value>Sync Vault Now</value>
+    <value>Sync vault now</value>
   </data>
   <data name="TouchID" xml:space="preserve">
     <value>Touch ID</value>
@@ -723,7 +723,7 @@
     <value>View Item</value>
   </data>
   <data name="WebVault" xml:space="preserve">
-    <value>Bitwarden Web Vault</value>
+    <value>Bitwarden web vault</value>
   </data>
   <data name="Lost2FAApp" xml:space="preserve">
     <value>Lost authenticator app?</value>
@@ -733,7 +733,7 @@
     <comment>Screen title</comment>
   </data>
   <data name="ExtensionActivated" xml:space="preserve">
-    <value>Extension Activated!</value>
+    <value>Extension activated!</value>
   </data>
   <data name="Icons" xml:space="preserve">
     <value>Icons</value>
@@ -770,6 +770,12 @@
   <data name="Enabled" xml:space="preserve">
     <value>Enabled</value>
   </data>
+  <data name="Off" xml:space="preserve">
+    <value>Off</value>
+  </data>
+  <data name="On" xml:space="preserve">
+    <value>On</value>
+  </data>
   <data name="Status" xml:space="preserve">
     <value>Status</value>
   </data>
@@ -798,7 +804,7 @@
     <value>You are searching for an auto-fill item for "{0}".</value>
   </data>
   <data name="LearnOrg" xml:space="preserve">
-    <value>Learn About Organizations</value>
+    <value>Learn about organizations</value>
   </data>
   <data name="CannotOpenApp" xml:space="preserve">
     <value>Cannot open the app "{0}".</value>
@@ -1542,10 +1548,10 @@
     <value>Default (System)</value>
   </data>
   <data name="DefaultDarkTheme" xml:space="preserve">
-    <value>Default Dark Theme</value>
+    <value>Default dark theme</value>
   </data>
   <data name="DefaultDarkThemeDescription" xml:space="preserve">
-    <value>Choose the dark theme to use when using Default (System) theme while your device's dark mode is enabled</value>
+    <value>Choose the dark theme to use when using Default (System) theme while your device's dark mode is enabled.</value>
   </data>
   <data name="CopyNotes" xml:space="preserve">
     <value>Copy Note</value>
@@ -1567,11 +1573,11 @@
     <value>Nord</value>
     <comment>'Nord' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
-  <data name="BlacklistedUris" xml:space="preserve">
-    <value>Blacklisted URIs</value>
+  <data name="AutofillBlockedUris" xml:space="preserve">
+    <value>Auto-fill blocked URIs</value>
   </data>
-  <data name="BlacklistedUrisDescription" xml:space="preserve">
-    <value>URIs that are blacklisted will not offer auto-fill. The list should be comma separated. Ex: "https://twitter.com, androidapp://com.twitter.android".</value>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
   </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Ask to add login</value>
@@ -1814,16 +1820,16 @@
     <value>Bitwarden needs attention - Enable "Draw-Over" in "Auto-fill Services" from Bitwarden Settings</value>
   </data>
   <data name="AutofillServices" xml:space="preserve">
-    <value>Auto-fill Services</value>
+    <value>Auto-fill services</value>
   </data>
   <data name="InlineAutofill" xml:space="preserve">
-    <value>Use Inline Autofill</value>
+    <value>Use inline autofill</value>
   </data>
   <data name="InlineAutofillDescription" xml:space="preserve">
     <value>Use inline autofill if your selected IME (keyboard) supports it. If your configuration is not supported (or this option is disabled), the default Autofill overlay will be used.</value>
   </data>
   <data name="Accessibility" xml:space="preserve">
-    <value>Use Accessibility</value>
+    <value>Use accessibility</value>
   </data>
   <data name="AccessibilityDescription" xml:space="preserve">
     <value>Use the Bitwarden Accessibility Service to auto-fill your logins across apps and the web. When enabled, we'll display a popup when login fields are selected.</value>
@@ -1838,7 +1844,7 @@
     <value>Required to use the Autofill Quick-Action Tile, or to augment the Autofill Service by using Draw-Over (if enabled).</value>
   </data>
   <data name="DrawOver" xml:space="preserve">
-    <value>Use Draw-Over</value>
+    <value>Use draw-over</value>
   </data>
   <data name="DrawOverDescription" xml:space="preserve">
     <value>When enabled, allows the Bitwarden Accessibility Service to display a popup when login fields are selected.</value>
@@ -2264,7 +2270,7 @@
     <value>We were unable to process your request. Please try again or contact us.</value>
   </data>
   <data name="AllowScreenCapture" xml:space="preserve">
-    <value>Allow Screen Capture</value>
+    <value>Allow screen capture</value>
   </data>
   <data name="AreYouSureYouWantToEnableScreenCapture" xml:space="preserve">
     <value>Are you sure you want to enable Screen Capture?</value>

src/Core/Models/View/FieldView.cs

@@ -19,5 +19,6 @@ namespace Bit.Core.Models.View
         public string MaskedValue => Value != null ? "••••••••" : null;
         public bool NewField { get; set; }
         public LinkedIdType? LinkedId { get; set; }
+        public bool BoolValue => bool.TryParse(Value, out var b) && b;
     }
 }

src/iOS.Autofill/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.autofill</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2022.6.2</string>
+	<string>2022.8.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleLocalizations</key>

src/iOS.Extension/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.find-login-action-extension</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2022.6.2</string>
+	<string>2022.8.0</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>

src/iOS.ShareExtension/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2022.6.2</string>
+	<string>2022.8.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>MinimumOSVersion</key>

src/iOS/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2022.6.2</string>
+	<string>2022.8.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleIconName</key>