Bump version to 2.17.0 (#1858)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
(cherry picked from commit a3a508eb83)

.config/dotnet-tools.json

@@ -1,12 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "dotnet-format": {
-      "version": "5.1.250801",
-      "commands": [
-        "dotnet-format"
-      ]
-    }
-  }
-}

.editorconfig

@@ -6,7 +6,6 @@ root = true
 # Don't use tabs for indentation.
 [*]
 indent_style = space
-end_of_line = lf
 # (Please don't specify an indent_size here; that has too many unintended consequences.)
 
 # Code files

.git-blame-ignore-revs

@@ -1,2 +0,0 @@
-# .NET format https://github.com/bitwarden/mobile/pull/1738
-04539af2a66668b6e85476d5cf318c9150ec4357

.gitattributes

@@ -1,7 +1,7 @@
 ###############################################################################
 # Set default behavior to automatically normalize line endings.
 ###############################################################################
-* text=auto eol=lf
+* text=auto
 
 ###############################################################################
 # Set default behavior for command prompt diff.

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,6 +21,11 @@
 
 
 
+## Testing requirements
+<!--What functionality requires testing by QA? This includes testing new behavior and regression testing-->
+
+
+
 ## Before you submit
 - [ ] I have added **unit tests** where it makes sense to do so (encouraged but not required)
 - [ ] This change requires a **documentation update** (notify the documentation team)

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout repo
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
       - name: Set up CLOC
         run: |
@@ -36,7 +36,7 @@ jobs:
       hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
       - name: Check if special branches exist
         id: branch-check
@@ -61,7 +61,7 @@ jobs:
     needs: setup
     steps:
       - name: Set up MSBuild
-        uses: microsoft/setup-msbuild@ab534842b4bdf384b8aaf93765dc6f721d9f5fab
+        uses: microsoft/setup-msbuild@c26a08ba26249b81327e26f6ef381897b6a8754d  # v1
 
       - name: Print environment
         run: |
@@ -72,7 +72,7 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Checkout repo
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
       - name: Decrypt secrets
         env:
@@ -105,14 +105,6 @@ jobs:
       - name: Restore packages
         run: nuget restore
 
-      - name: Restore tools
-        run: dotnet tool restore
-        shell: pwsh
-
-      - name: Verify Format
-        run: dotnet tool run dotnet-format --check
-        shell: pwsh
-
       - name: Run Core tests
         run: dotnet test test/Core.Test/Core.Test.csproj
 
@@ -175,14 +167,14 @@ jobs:
         shell: pwsh
 
       - name: Upload Play Store .aab artifact
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.4
         with:
           name: com.x8bit.bitwarden.aab
           path: ./com.x8bit.bitwarden.aab
           if-no-files-found: error
 
       - name: Upload Play Store .apk artifact
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.4
         with:
           name: com.x8bit.bitwarden.apk
           path: ./com.x8bit.bitwarden.apk
@@ -210,7 +202,7 @@ jobs:
     runs-on: windows-2019
     steps:
       - name: Set up MSBuild
-        uses: microsoft/setup-msbuild@ab534842b4bdf384b8aaf93765dc6f721d9f5fab
+        uses: microsoft/setup-msbuild@c26a08ba26249b81327e26f6ef381897b6a8754d  # v1
 
       - name: Print environment
         run: |
@@ -221,7 +213,7 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Checkout repo
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
       - name: Decrypt secrets
         env:
@@ -304,6 +296,18 @@ jobs:
 
           $xml.Save($androidPath);
 
+          Write-Output "########################################"
+          Write-Output "##### Uninstall from App.csproj"
+          Write-Output "########################################"
+
+          $xml=New-Object XML;
+          $xml.Load($appPath);
+
+          $appCenterNode=$xml.SelectSingleNode("/Project/ItemGroup/PackageReference[@Include='Microsoft.AppCenter.Crashes']");
+          $appCenterNode.ParentNode.RemoveChild($appCenterNode);
+
+          $xml.Save($appPath);
+
           Write-Output "########################################"
           Write-Output "##### Uninstall from Core.csproj"
           Write-Output "########################################"
@@ -356,7 +360,7 @@ jobs:
         shell: pwsh
 
       - name: Upload F-Droid .apk artifact
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.4
         with:
           name: com.x8bit.bitwarden-fdroid.apk
           path: ./com.x8bit.bitwarden-fdroid.apk
@@ -377,16 +381,16 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Checkout repo
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
       - name: Login to Azure - Prod Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
+        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
         with:
           creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: Azure/get-keyvault-secrets@b5c723b9ac7870c022b8c35befe620b7009b336f
+        uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403
         with:
           keyvault: "bitwarden-prod-kv"
           secrets: "appcenter-ios-token"
@@ -408,8 +412,7 @@ jobs:
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
             --output $HOME/secrets/dist_extension.mobileprovision ./.github/secrets/dist_extension.mobileprovision.gpg
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
-            --output $HOME/secrets/dist_share_extension.mobileprovision \
-            ./.github/secrets/dist_share_extension.mobileprovision.gpg
+            --output $HOME/secrets/dist_share_extension.mobileprovision ./.github/secrets/dist_share_extension.mobileprovision.gpg
         shell: bash
 
       - name: Increment version
@@ -505,7 +508,7 @@ jobs:
             -exportOptionsPlist $EXPORT_OPTIONS_PATH
         shell: bash
 
-      - name: Copy all dSYMs files to upload
+      - name: Copy all dSYMs files to upload 
         run: |
           ARCHIVE_DSYMS_PATH="$HOME/Library/Developer/Xcode/Archives/*/*.xcarchive/dSYMs"
           EXPORT_PATH="./bitwarden-export"
@@ -514,7 +517,7 @@ jobs:
         shell: bash
 
       - name: Upload App Store .ipa & dSYMs artifacts
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.4
         with:
           name: Bitwarden iOS
           path: |
@@ -524,12 +527,15 @@ jobs:
 
       - name: Install AppCenter CLI
         if: |
-          (github.ref == 'refs/heads/master'
-            && needs.setup.outputs.rc_branch_exists == 0
-            && needs.setup.outputs.hotfix_branch_exists == 0)
-          || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
-          || github.ref == 'refs/heads/hotfix-rc'
-        run: npm install -g appcenter-cli
+            (github.ref == 'refs/heads/master'
+              && needs.setup.outputs.rc_branch_exists == 0
+              && needs.setup.outputs.hotfix_branch_exists == 0)
+            || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
+            || github.ref == 'refs/heads/hotfix-rc'
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - run: npm install -g appcenter-cli
 
       - name: Upload dSYMs to App Center
         if: |
@@ -540,7 +546,7 @@ jobs:
             || github.ref == 'refs/heads/hotfix-rc'
         env:
           APPCENTER_IOS_TOKEN: ${{ steps.retrieve-secrets.outputs.appcenter-ios-token }}
-        run: appcenter crashes upload-symbols -a bitwarden/bitwarden -s "./bitwarden-export/dSYMs" --token $APPCENTER_IOS_TOKEN
+        run: appcenter crashes upload-symbols -a kspearrin/bitwarden -s "./bitwarden-export/dSYMs" --token $APPCENTER_IOS_TOKEN
         shell: bash
 
       - name: Deploy to App Store
@@ -571,22 +577,22 @@ jobs:
       _CROWDIN_PROJECT_ID: "269690"
     steps:
       - name: Checkout repo
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
       - name: Login to Azure
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
+        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
         with:
           creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: Azure/get-keyvault-secrets@b5c723b9ac7870c022b8c35befe620b7009b336f
+        uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403
         with:
           keyvault: "bitwarden-prod-kv"
           secrets: "crowdin-api-token"
 
       - name: Upload Sources
-        uses: crowdin/github-action@9237b4cb361788dfce63feb2e2f15c09e2fe7415
+        uses: crowdin/github-action@e39093fd75daae7859c68eded4b43d42ec78d8ea  # v1.3.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
@@ -633,21 +639,21 @@ jobs:
           fi
 
       - name: Login to Azure - Prod Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
+        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
         if: failure()
         with:
           creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: Azure/get-keyvault-secrets@b5c723b9ac7870c022b8c35befe620b7009b336f
+        uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403
         if: failure()
         with:
           keyvault: "bitwarden-prod-kv"
           secrets: "devops-alerts-slack-webhook-url"
 
       - name: Notify Slack on failure
-        uses: act10ns/slack@da3191ebe2e67f49b46880b4633f5591a96d1d33
+        uses: act10ns/slack@e4e71685b9b239384b0f676a63c32367f59c2522  # v1.2.2
         if: failure()
         env:
           SLACK_WEBHOOK_URL: ${{ steps.retrieve-secrets.outputs.devops-alerts-slack-webhook-url }}

.github/workflows/release.yml

@@ -12,7 +12,7 @@ on:
         options:
           - Initial Release
           - Redeploy
-          - Dry Run
+          - dry-run
 
 jobs:
   release:
@@ -22,7 +22,7 @@ jobs:
       branch-name: ${{ steps.branch.outputs.branch-name }}
     steps:
       - name: Branch check
-        if: github.event.inputs.release_type != 'Dry Run'
+        if: github.event.inputs.release_type != 'dry-run'
         run: |
           if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix-rc" ]]; then
             echo "==================================="
@@ -75,7 +75,7 @@ jobs:
         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,
@@ -171,5 +171,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

CONTRIBUTING.md

@@ -14,7 +14,7 @@ Here is how you can get involved:
   
 * **Write documentation:** Submit a pull request to the [Bitwarden help repository](https://github.com/bitwarden/help)
   
-* **Help other users:** Go to the [Ask the Bitwarden Community category](https://community.bitwarden.com/c/support/) on the Community Forums
+* **Help other users:** Go to the [User-to-User Support category](https://community.bitwarden.com/c/support/) on the Community Forums
   
 * **Translate:** See the localization (i10n) section below
 
@@ -35,6 +35,6 @@ We use a translation tool called [Crowdin](https://crowdin.com) to help manage o
 
 If you are interested in helping translate the Bitwarden mobile app into another language (or make a translation correction), please register an account at Crowdin and join our project here: https://crowdin.com/project/bitwarden-mobile
 
-If the language that you are interested in translating is not already listed, create a new account on Crowdin, join the project, and contact the project owner (https://crowdin.com/profile/dwbit).
+If the language that you are interested in translating is not already listed, create a new account on Crowdin, join the project, and contact the project owner (https://crowdin.com/profile/kspearrin).
 
 You can read Crowdin's getting started guide for translators here: https://support.crowdin.com/crowdin-intro/

README.md

@@ -33,23 +33,3 @@ Code contributions are welcome! Visual Studio with Xamarin is required to work o
 Learn more about how to contribute by reading the [`CONTRIBUTING.md`](CONTRIBUTING.md) file.
 
 Security audits and feedback are welcome. Please open an issue or email us privately if the report is sensitive in nature. You can read our security policy in the [`SECURITY.md`](SECURITY.md) file.
-
-### Dotnet-format
-
-We recently migrated to using dotnet-format as code formatter. All previous branches will need to updated to avoid large merge conflicts using the following steps:
-
-1. Check out your local Branch
-2. Run `git merge e0efcfbe45b2a27c73e9593bfd7a71fad2aa7a35`
-3. Resolve any merge conflicts, commit.
-4. Run `dotnet tool run dotnet-format`
-5. Commit
-6. Run `git merge -Xours 04539af2a66668b6e85476d5cf318c9150ec4357`
-7. Push
-
-#### Git blame
-
-We also recommend that you configure git to ignore the prettier revision using:
-
-```bash
-git config blame.ignoreRevsFile .git-blame-ignore-revs
-```

SECURITY.md

@@ -1,11 +1,39 @@
-Bitwarden believes that working with security researchers across the globe is crucial to keeping our users safe. If you believe you've found a security issue in our product or service, we encourage you to please submit a report through our [HackerOne Program](https://hackerone.com/bitwarden/). We welcome working with you to resolve the issue promptly. Thanks in advance!
+Bitwarden believes that working with security researchers across the globe is crucial to keeping our
+users safe. If you believe you've found a security issue in our product or service, we encourage you to
+notify us. We welcome working with you to resolve the issue promptly. Thanks in advance!
 
 # Disclosure Policy
 
-- Let us know as soon as possible upon discovery of a potential security issue, and we'll make every effort to quickly resolve the issue.
-- Provide us a reasonable amount of time to resolve the issue before any disclosure to the public or a third-party. We may publicly disclose the issue before resolving it, if appropriate.
-- Make a good faith effort to avoid privacy violations, destruction of data, and interruption or degradation of our service. Only interact with accounts you own or with explicit permission of the account holder.
-- If you would like to encrypt your report, please use the PGP key with long ID `0xDE6887086F892325FEC04CC0D847525B6931381F` (available in the public keyserver pool).
+- Let us know as soon as possible upon discovery of a potential security issue, and we'll make every
+  effort to quickly resolve the issue.
+- Provide us a reasonable amount of time to resolve the issue before any disclosure to the public or a
+  third-party. We may publicly disclose the issue before resolving it, if appropriate. 
+- Make a good faith effort to avoid privacy violations, destruction of data, and interruption or
+  degradation of our service. Only interact with accounts you own or with explicit permission of the
+  account holder.
+- If you would like to encrypt your report, please use the PGP key with long ID
+  `0xDE6887086F892325FEC04CC0D847525B6931381F` (available in the public keyserver pool).
+
+# In-scope
+
+- Security issues in any current release of Bitwarden. This includes the web vault, browser extension,
+  and mobile apps (iOS and Android). Product downloads are available at https://bitwarden.com. Source
+  code is available at https://github.com/bitwarden.
+
+# Exclusions
+
+The following bug classes are out-of scope:
+
+- Bugs that are already reported on any of Bitwarden's issue trackers (https://github.com/bitwarden),
+  or that we already know of. Note that some of our issue tracking is private.
+- Issues in an upstream software dependency (ex: Xamarin, ASP.NET) which are already reported to the
+  upstream maintainer.
+- Attacks requiring physical access to a user's device.
+- Self-XSS
+- Issues related to software or protocols not under Bitwarden's control
+- Vulnerabilities in outdated versions of Bitwarden
+- Missing security best practices that do not directly lead to a vulnerability
+- Issues that do not have any impact on the general public
 
 While researching, we'd like to ask you to refrain from:
 
@@ -14,8 +42,4 @@ While researching, we'd like to ask you to refrain from:
 - Social engineering (including phishing) of Bitwarden staff or contractors
 - Any physical attempts against Bitwarden property or data centers
 
-# We want to help you!
-
-If you have something that you feel is close to exploitation, or if you'd like some information regarding the internal API, or generally have any questions regarding the app that would help in your efforts, please email us at https://bitwarden.com/contact and ask for that information. As stated above, Bitwarden wants to help you find issues, and is more than willing to help.
-
 Thank you for helping keep Bitwarden and our users safe!

src/Android/Android.csproj

@@ -84,7 +84,7 @@
     <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.2.5.2" />
     <PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.8" />
     <PackageReference Include="Xamarin.Essentials">
-      <Version>1.7.2</Version>
+      <Version>1.7.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Firebase.Messaging">
       <Version>122.0.0</Version>
@@ -145,12 +145,12 @@
     <Compile Include="Tiles\GeneratorTileService.cs" />
     <Compile Include="Tiles\MyVaultTileService.cs" />
     <Compile Include="Utilities\AndroidHelpers.cs" />
+    <Compile Include="Utilities\AppCenterHelper.cs" />
     <Compile Include="Utilities\ThemeHelpers.cs" />
     <Compile Include="WebAuthCallbackActivity.cs" />
     <Compile Include="Renderers\SelectableLabelRenderer.cs" />
     <Compile Include="Services\ClipboardService.cs" />
     <Compile Include="Utilities\IntentExtensions.cs" />
-    <Compile Include="Renderers\CustomPageRenderer.cs" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\bwi-font.ttf" />

src/Android/MainActivity.cs

@@ -69,20 +69,16 @@ namespace Bit.Droid
                 Window.AddFlags(Android.Views.WindowManagerFlags.Secure);
             }
 
-            ServiceContainer.Resolve<ILogger>("logger").InitAsync();
-
-            var toplayout = Window?.DecorView?.RootView;
-            if (toplayout != null)
-            {
-                toplayout.FilterTouchesWhenObscured = true;
-            }
+#if !DEBUG && !FDROID
+            var appCenterHelper = new AppCenterHelper(_appIdService, _stateService);
+            var appCenterTask = appCenterHelper.InitAsync();
+#endif
 
             Xamarin.Essentials.Platform.Init(this, savedInstanceState);
             Xamarin.Forms.Forms.Init(this, savedInstanceState);
             _appOptions = GetOptions();
             LoadApplication(new App.App(_appOptions));
 
-
             _broadcasterService.Subscribe(_activityKey, (message) =>
             {
                 if (message.Command == "startEventTimer")

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.05.1" 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="2.17.0" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
 

src/Android/Renderers/CustomPageRenderer.cs

@@ -1,31 +0,0 @@
-using System;
-using Android.App;
-using Android.Content;
-using AndroidX.AppCompat.Widget;
-using Bit.App.Resources;
-using Bit.Droid.Renderers;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(ContentPage), typeof(CustomPageRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class CustomPageRenderer : PageRenderer
-    {
-        public CustomPageRenderer(Context context) : base(context)
-        {
-        }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Page> e)
-        {
-            base.OnElementChanged(e);
-
-            Activity context = (Activity)this.Context;
-            var toolbar = context.FindViewById<Toolbar>(Resource.Id.toolbar);
-            if(toolbar != null)
-            {
-                toolbar.NavigationContentDescription = AppResources.TapToGoBack;
-            }
-        }
-    }
-}

src/Android/Services/BiometricService.cs

@@ -1,10 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using Android.OS;
 using Android.Security.Keystore;
 using Bit.Core.Abstractions;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
 using Java.Security;
 using Javax.Crypto;
 
@@ -42,22 +43,23 @@ namespace Bit.Droid.Services
 
         public Task<bool> ValidateIntegrityAsync(string bioIntegrityKey = null)
         {
+            // bioIntegrityKey used in iOS only
             if (Build.VERSION.SdkInt < BuildVersionCodes.M)
             {
                 return Task.FromResult(true);
             }
 
+            _keystore.Load(null);
+            IKey key = _keystore.GetKey(KeyName, null);
+            Cipher cipher = Cipher.GetInstance(Transformation);
+
+            if (key == null || cipher == null)
+            {
+                return Task.FromResult(true);
+            }
+
             try
             {
-                _keystore.Load(null);
-                var key = _keystore.GetKey(KeyName, null);
-                var cipher = Cipher.GetInstance(Transformation);
-
-                if (key == null || cipher == null)
-                {
-                    return Task.FromResult(true);
-                }
-
                 cipher.Init(CipherMode.EncryptMode, key);
             }
             catch (KeyPermanentlyInvalidatedException e)
@@ -73,7 +75,6 @@ namespace Bit.Droid.Services
             catch (InvalidKeyException e)
             {
                 // Fallback for old bitwarden users without a key
-                LoggerHelper.LogEvenIfCantBeResolved(e);
                 CreateKey();
             }
 
@@ -94,11 +95,10 @@ namespace Bit.Droid.Services
                 keyGen.Init(keyGenSpec);
                 keyGen.GenerateKey();
             }
-            catch (Exception e)
+            catch
             {
                 // Catch silently to allow biometrics to function on devices that are in a state where key generation
                 // is not functioning
-                LoggerHelper.LogEvenIfCantBeResolved(e);
             }
         }
     }

src/Android/Services/DeviceActionService.cs

@@ -674,7 +674,7 @@ namespace Bit.Droid.Services
             else
             {
                 var data = new Intent();
-                if (cipher?.Login == null)
+                if (cipher == null)
                 {
                     data.PutExtra("canceled", "true");
                 }
@@ -734,11 +734,6 @@ namespace Bit.Droid.Services
             return Accessibility.AccessibilityHelpers.OverlayPermitted();
         }
 
-        public bool HasAutofillService()
-        {
-            return true;
-        }
-
         public void OpenAccessibilityOverlayPermissionSettings()
         {
             var activity = (MainActivity)CrossCurrentActivity.Current.Activity;

src/Android/Utilities/AppCenterHelper.cs

@@ -0,0 +1,58 @@
+#if !FDROID
+using Bit.Core.Abstractions;
+using System.Threading.Tasks;
+using Microsoft.AppCenter;
+using Microsoft.AppCenter.Crashes;
+using Newtonsoft.Json;
+
+namespace Bit.Droid.Utilities
+{
+    public class AppCenterHelper
+    {
+        private const string AppSecret = "d3834185-b4a6-4347-9047-b86c65293d42";
+
+        private readonly IAppIdService _appIdService;
+        private readonly IStateService _stateService;
+
+        private string _userId;
+        private string _appId;
+        
+        public AppCenterHelper(
+            IAppIdService appIdService,
+            IStateService stateService)
+        {
+            _appIdService = appIdService;
+            _stateService = stateService;
+        }
+
+        public async Task InitAsync()
+        {
+            _userId = await _stateService.GetActiveUserIdAsync();
+            _appId = await _appIdService.GetAppIdAsync();
+            
+            AppCenter.Start(AppSecret, typeof(Crashes));
+            AppCenter.SetUserId(_userId);
+            
+            Crashes.GetErrorAttachments = (ErrorReport report) =>
+            {
+                return new ErrorAttachmentLog[]
+                {
+                    ErrorAttachmentLog.AttachmentWithText(Description, "crshdesc.txt"),
+                };
+            };
+        }
+
+        public string Description
+        {
+            get
+            {
+                return JsonConvert.SerializeObject(new
+                {
+                    AppId = _appId,
+                    UserId = _userId
+                }, Formatting.Indented);
+            }
+        }
+    }
+}
+#endif

src/App/Abstractions/IDeviceActionService.cs

@@ -1,6 +1,6 @@
-using System.Threading.Tasks;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.View;
+using System.Threading.Tasks;
 
 namespace Bit.App.Abstractions
 {
@@ -35,7 +35,6 @@ namespace Bit.App.Abstractions
         void Background();
         bool AutofillAccessibilityServiceRunning();
         bool AutofillAccessibilityOverlayPermitted();
-        bool HasAutofillService();
         bool AutofillServiceEnabled();
         void DisableAutofillService();
         bool AutofillServicesEnabled();

src/App/Abstractions/IPasswordRepromptService.cs

@@ -7,7 +7,7 @@ namespace Bit.App.Abstractions
         string[] ProtectedFields { get; }
 
         Task<bool> ShowPasswordPromptAsync();
-
+        
         Task<(string password, bool valid)> ShowPasswordPromptAndGetItAsync();
 
         Task<bool> Enabled();

src/App/Abstractions/IPushNotificationListenerService.cs

@@ -1,5 +1,5 @@
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
+using System.Threading.Tasks;
 
 namespace Bit.App.Abstractions
 {

src/App/App.csproj

@@ -13,12 +13,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.4.0" />
     <PackageReference Include="Plugin.Fingerprint" Version="2.1.4" />
     <PackageReference Include="SkiaSharp.Views.Forms" Version="2.80.3" />
-    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.1" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.2" />
+    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.0" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.1" />
     <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2337" />
     <PackageReference Include="ZXing.Net.Mobile" Version="2.4.1" />
     <PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.4.1" />
   </ItemGroup>
@@ -127,7 +128,6 @@
   <ItemGroup>
     <Folder Include="Resources\" />
     <Folder Include="Behaviors\" />
-    <Folder Include="Pages\Authenticator\" />
     <Folder Include="Controls\AccountSwitchingOverlay\" />
   </ItemGroup>
 

src/App/App.xaml.cs

@@ -1,15 +1,15 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
+using Bit.App.Abstractions;
 using Bit.App.Models;
 using Bit.App.Pages;
 using Bit.App.Resources;
 using Bit.App.Services;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
-using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
+using System;
+using System.Threading.Tasks;
+using Bit.Core.Enums;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
@@ -208,10 +208,7 @@ namespace Bit.App
                 {
                     await _stateService.SetLastActiveTimeAsync(_deviceActionService.GetActiveTime());
                 }
-                if (!SetTabsPageFromAutofill(isLocked))
-                {
-                    ClearAutofillUri();
-                }
+                SetTabsPageFromAutofill(isLocked);
                 await SleptAsync();
             }
         }
@@ -318,7 +315,7 @@ namespace Bit.App
                     Options.HideAccountSwitcher = await _stateService.GetActiveUserIdAsync() == null;
                     Current.MainPage = new NavigationPage(new LoginPage(email, Options));
                 }
-                else if (await _vaultTimeoutService.IsLockedAsync() ||
+                else if (await _vaultTimeoutService.IsLockedAsync() || 
                          await _vaultTimeoutService.ShouldLockAsync())
                 {
                     Current.MainPage = new NavigationPage(new LockPage(Options));
@@ -368,15 +365,7 @@ namespace Bit.App
             }
         }
 
-        private void ClearAutofillUri()
-        {
-            if (Device.RuntimePlatform == Device.Android && !string.IsNullOrWhiteSpace(Options.Uri))
-            {
-                Options.Uri = null;
-            }
-        }
-
-        private bool SetTabsPageFromAutofill(bool isLocked)
+        private void SetTabsPageFromAutofill(bool isLocked)
         {
             if (Device.RuntimePlatform == Device.Android && !string.IsNullOrWhiteSpace(Options.Uri) &&
                 !Options.FromAutofillFramework)
@@ -396,9 +385,7 @@ namespace Bit.App
                         }
                     });
                 });
-                return true;
             }
-            return false;
         }
 
         private void Prime()

src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml.cs

@@ -99,7 +99,7 @@ namespace Bit.App.Controls
                 Opacity = 0;
                 IsVisible = true;
                 this.FadeTo(1, 100);
-
+                
                 if (Device.RuntimePlatform == Device.Android && MainFab != null)
                 {
                     // start fab fade-out

src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayViewModel.cs

@@ -22,11 +22,11 @@ namespace Bit.App.Controls
         {
             _stateService = stateService;
             _messagingService = messagingService;
-
+            
             SelectAccountCommand = new AsyncCommand<AccountViewCellViewModel>(SelectAccountAsync,
                 onException: ex => logger.Exception(ex),
                 allowsMultipleExecutions: false);
-
+            
             LongPressAccountCommand = new AsyncCommand<Tuple<ContentPage, AccountViewCellViewModel>>(LongPressAccountAsync,
                 onException: ex => logger.Exception(ex),
                 allowsMultipleExecutions: false);

src/App/Controls/AccountViewCell/AccountViewCell.xaml.cs

@@ -1,5 +1,5 @@
-using System.Windows.Input;
 using Bit.Core.Models.View;
+using System.Windows.Input;
 using Xamarin.Forms;
 
 namespace Bit.App.Controls

src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml

@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<controls:ExtendedGrid xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Bit.App.Controls.AuthenticatorViewCell"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    xmlns:ff="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-    StyleClass="list-row, list-row-platform"
-    RowSpacing="0"
-    ColumnSpacing="0"
-    x:DataType="pages:AuthenticatorPageListItem">
-
-    <Grid.Resources>
-          <u:IconGlyphConverter x:Key="iconGlyphConverter"/>
-          <u:IconImageConverter x:Key="iconImageConverter"/>
-          <u:InverseBoolConverter x:Key="inverseBool" />
-          <u:StringHasValueConverter x:Key="stringHasValueConverter" />
-    </Grid.Resources>
-
-    <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-    </Grid.RowDefinitions>
-
-    <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="40" />
-        <ColumnDefinition Width="*" />
-        <ColumnDefinition Width="60" />
-    </Grid.ColumnDefinitions>
-
-    <controls:IconLabel
-        Grid.Column="0"
-        HorizontalOptions="Center"
-        VerticalOptions="Center"
-        StyleClass="list-icon, list-icon-platform"
-        IsVisible="{Binding ShowIconImage, Converter={StaticResource inverseBool}}"
-        Text="{Binding Cipher, Converter={StaticResource iconGlyphConverter}}"
-        AutomationProperties.IsInAccessibleTree="False" />
-
-    <ff:CachedImage
-        Grid.Column="0"
-        BitmapOptimizations="True"
-        ErrorPlaceholder="login.png"
-        LoadingPlaceholder="login.png"
-        HorizontalOptions="Center"
-        VerticalOptions="Center"
-        WidthRequest="22"
-        HeightRequest="22"
-        IsVisible="{Binding ShowIconImage}"
-        Source="{Binding IconImageSource, Mode=OneTime}"
-        AutomationProperties.IsInAccessibleTree="False" />
-
-    <Grid RowSpacing="0" ColumnSpacing="0" Grid.Row="0" Grid.Column="1" VerticalOptions="Center" Padding="0, 7">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
-
-        <controls:MonoLabel
-            LineBreakMode="TailTruncation"
-            Grid.Column="0"
-            Grid.Row="0"
-            Grid.ColumnSpan="3"
-            StyleClass="list-title, list-title-platform"
-            Text="{Binding TotpCodeFormatted, Mode=OneWay}" />
-        <Label 
-            LineBreakMode="TailTruncation"
-            Grid.Column="0"
-            Grid.Row="1"
-            StyleClass="list-subtitle, list-subtitle-platform"
-            Text="{Binding Cipher.Name}" />
-        <controls:IconLabel
-            Grid.Column="1"
-            Grid.Row="1"
-            HorizontalOptions="Start"
-            VerticalOptions="Center"
-            StyleClass="list-title-icon"
-            Margin="5, 0, 0, 0"
-            Text="{Binding Source={x:Static core:BitwardenIcons.Collection}}"
-            IsVisible="{Binding Cipher.Shared, Mode=OneTime}"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Shared}" />
-    </Grid>
-
-    <Label
-        Text="{Binding TotpSec, Mode=OneWay}"
-        Style="{DynamicResource textTotp}"
-        Margin="0, 0, 10, 0"
-        Grid.Row="0"
-        Grid.Column="1"
-        Grid.RowSpan="2"
-        HorizontalOptions="End"
-        HorizontalTextAlignment="End"
-        VerticalOptions="CenterAndExpand" />
-    <controls:IconButton 
-        StyleClass="box-row-button, box-row-button-platform"
-        Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
-        Command="{Binding CopyCommand}"
-        CommandParameter="LoginTotp"
-        Grid.Row="0"
-        Grid.Column="2"
-        Grid.RowSpan="2"
-        Padding="0,0,1,0"
-        AutomationProperties.IsInAccessibleTree="True"
-        AutomationProperties.Name="{u:I18n CopyTotp}" />
-</controls:ExtendedGrid>

src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml.cs

@@ -1,121 +0,0 @@
-using System;
-using Bit.App.Utilities;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public partial class AuthenticatorViewCell : ExtendedGrid
-    {
-        public static readonly BindableProperty CipherProperty = BindableProperty.Create(
-            nameof(Cipher), typeof(CipherView), typeof(AuthenticatorViewCell), default(CipherView), BindingMode.TwoWay);
-
-        public static readonly BindableProperty WebsiteIconsEnabledProperty = BindableProperty.Create(
-            nameof(WebsiteIconsEnabled), typeof(bool?), typeof(AuthenticatorViewCell));
-
-        public static readonly BindableProperty TotpSecProperty = BindableProperty.Create(
-            nameof(TotpSec), typeof(long), typeof(AuthenticatorViewCell));
-
-        //public static readonly BindableProperty ButtonCommandProperty = BindableProperty.Create(
-        //    nameof(ButtonCommand), typeof(Command<CipherView>), typeof(AuthenticatorViewCell));
-
-        public AuthenticatorViewCell()
-        {
-            InitializeComponent();
-        }
-
-        public Command CopyCommand { get; set; }
-
-        public CipherView Cipher
-        {
-            get => GetValue(CipherProperty) as CipherView;
-            set => SetValue(CipherProperty, value);
-        }
-
-        public bool? WebsiteIconsEnabled
-        {
-            get => (bool)GetValue(WebsiteIconsEnabledProperty);
-            set => SetValue(WebsiteIconsEnabledProperty, value);
-        }
-
-        public long TotpSec
-        {
-            get => (long)GetValue(TotpSecProperty);
-            set => SetValue(TotpSecProperty, value);
-        }
-
-        public bool ShowIconImage
-        {
-            get => WebsiteIconsEnabled ?? false
-                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
-                && IconImageSource != null;
-        }
-
-        private string _iconImageSource = string.Empty;
-        public string IconImageSource
-        {
-            get
-            {
-                if (_iconImageSource == string.Empty) // default value since icon source can return null
-                {
-                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
-                }
-                return _iconImageSource;
-            }
-
-        }
-
-        private string _totpCodeFormatted = "938 928";
-        public string TotpCodeFormatted
-        {
-            get => _totpCodeFormatted;
-            set => _totpCodeFormatted = value;
-        }
-
-
-        //public Command<CipherView> ButtonCommand
-        //{
-        //    get => GetValue(ButtonCommandProperty) as Command<CipherView>;
-        //    set => SetValue(ButtonCommandProperty, value);
-        //}
-
-        //protected override void OnPropertyChanged(string propertyName = null)
-        //{
-        //    base.OnPropertyChanged(propertyName);
-        //    if (propertyName == CipherProperty.PropertyName)
-        //    {
-        //        if (Cipher == null)
-        //        {
-        //            return;
-        //        }
-        //        _cipherLabel.Text = Cipher.Name;
-        //    }
-        //    else if (propertyName == WebsiteIconsEnabledProperty.PropertyName)
-        //    {
-        //        if (Cipher == null)
-        //        {
-        //            return;
-        //        }
-        //        ((AuthenticatorViewCellViewModel)BindingContext).WebsiteIconsEnabled = WebsiteIconsEnabled ?? false;
-        //    }
-        //    else if (propertyName == TotpSecProperty.PropertyName)
-        //    {
-        //        if (Cipher == null)
-        //        {
-        //            return;
-        //        }
-        //        ((AuthenticatorViewCellViewModel)BindingContext).UpdateTotpSec(TotpSec);
-        //    }
-        //}
-
-        private void MoreButton_Clicked(object sender, EventArgs e)
-        {
-            var cipher = ((sender as MiButton)?.BindingContext as AuthenticatorViewCellViewModel)?.Cipher;
-            if (cipher != null)
-            {
-                //ButtonCommand?.Execute(cipher);
-            }
-        }
-    }
-}

src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCellViewModel.cs

@@ -1,103 +0,0 @@
-using System.Threading.Tasks;
-using Bit.App.Utilities;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class AuthenticatorViewCellViewModel : ExtendedViewModel
-    {
-        private CipherView _cipher;
-        private string _totpCodeFormatted = "938 928";
-        private string _totpSec;
-        private bool _websiteIconsEnabled;
-        private string _iconImageSource = string.Empty;
-
-        public AuthenticatorViewCellViewModel(CipherView cipherView, bool websiteIconsEnabled)
-        {
-            Cipher = cipherView;
-            WebsiteIconsEnabled = websiteIconsEnabled;
-        }
-
-        public Command CopyCommand { get; set; }
-
-        public CipherView Cipher
-        {
-            get => _cipher;
-            set => SetProperty(ref _cipher, value);
-        }
-
-        public string TotpCodeFormatted
-        {
-            get => _totpCodeFormatted;
-            set => SetProperty(ref _totpCodeFormatted, value);
-        }
-
-        public string TotpSec
-        {
-            get => _totpSec;
-            set => SetProperty(ref _totpSec, value);
-        }
-
-        public bool WebsiteIconsEnabled
-        {
-            get => _websiteIconsEnabled;
-            set => SetProperty(ref _websiteIconsEnabled, value);
-        }
-
-        public bool ShowIconImage
-        {
-            get => WebsiteIconsEnabled
-                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
-                && IconImageSource != null;
-        }
-
-        public string IconImageSource
-        {
-            get
-            {
-                if (_iconImageSource == string.Empty) // default value since icon source can return null
-                {
-                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
-                }
-                return _iconImageSource;
-            }
-
-        }
-
-        public void UpdateTotpSec(long totpSec)
-        {
-            _totpSec = totpSec.ToString();
-        }
-
-        //private async Task TotpUpdateCodeAsync()
-        //{
-        //    if (Cipher == null || Cipher.Type != Core.Enums.CipherType.Login || Cipher.Login.Totp == null)
-        //    {
-        //        _totpInterval = null;
-        //        return;
-        //    }
-        //    _totpCode = await _totpService.GetCodeAsync(Cipher.Login.Totp);
-        //    if (_totpCode != null)
-        //    {
-        //        if (_totpCode.Length > 4)
-        //        {
-        //            var half = (int)Math.Floor(_totpCode.Length / 2M);
-        //            TotpCodeFormatted = string.Format("{0} {1}", _totpCode.Substring(0, half),
-        //                _totpCode.Substring(half));
-        //        }
-        //        else
-        //        {
-        //            TotpCodeFormatted = _totpCode;
-        //        }
-        //    }
-        //    else
-        //    {
-        //        TotpCodeFormatted = null;
-        //        _totpInterval = null;
-        //    }
-        //}
-    }
-}
-

src/App/Controls/AvatarImageSource.cs

@@ -112,13 +112,13 @@ namespace Bit.App.Controls
 
         private string GetFirstLetters(string data, int charCount)
         {
-            var parts = data.Split();
+            var parts  = data.Split();
             if (parts.Length > 1 && charCount <= 2)
             {
                 var text = "";
                 for (int i = 0; i < charCount; i++)
                 {
-                    text += parts[i].Substring(0, 1);
+                    text += parts[i].Substring(0,1);
                 }
                 return text;
             }

src/App/Controls/CipherViewCell/CipherViewCell.xaml

@@ -108,7 +108,7 @@
     <controls:MiButton
         Grid.Row="0"
         Grid.Column="2"
-        Text="{Binding Source={x:Static core:BitwardenIcons.ViewCellMenu}}"
+        Text="&#xe5d3;"
         StyleClass="list-row-button, list-row-button-platform, btn-disabled"
         Clicked="MoreButton_Clicked"
         VerticalOptions="CenterAndExpand"

src/App/Controls/ExtendedStepper.cs

@@ -6,7 +6,7 @@ namespace Bit.App.Controls
     {
         public static readonly BindableProperty StepperBackgroundColorProperty = BindableProperty.Create(
             nameof(StepperBackgroundColor), typeof(Color), typeof(ExtendedStepper), Color.Default);
-
+        
         public static readonly BindableProperty StepperForegroundColorProperty = BindableProperty.Create(
             nameof(StepperForegroundColor), typeof(Color), typeof(ExtendedStepper), Color.Default);
 
@@ -15,7 +15,7 @@ namespace Bit.App.Controls
             get => (Color)GetValue(StepperBackgroundColorProperty);
             set => SetValue(StepperBackgroundColorProperty, value);
         }
-
+        
         public Color StepperForegroundColor
         {
             get => (Color)GetValue(StepperForegroundColorProperty);

src/App/Controls/SendViewCell/SendViewCell.xaml

@@ -122,7 +122,7 @@
     <controls:MiButton
         Grid.Row="0"
         Grid.Column="2"
-        Text="{Binding Source={x:Static core:BitwardenIcons.ViewCellMenu}}"
+        Text="&#xe5d3;"
         IsVisible="{Binding ShowOptions, Mode=OneWay}"
         StyleClass="list-row-button, list-row-button-platform, btn-disabled"
         Clicked="MoreButton_Clicked"

src/App/Controls/SendViewCell/SendViewCell.xaml.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Bit.App.Abstractions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
@@ -13,7 +13,7 @@ namespace Bit.App.Controls
 
         public static readonly BindableProperty ButtonCommandProperty = BindableProperty.Create(
             nameof(ButtonCommand), typeof(Command<SendView>), typeof(SendViewCell));
-
+        
         public static readonly BindableProperty ShowOptionsProperty = BindableProperty.Create(
             nameof(ShowOptions), typeof(bool), typeof(SendViewCell), true, BindingMode.OneWay);
 

src/App/Effects/FabShadowEffect.cs

@@ -4,8 +4,8 @@ namespace Bit.App.Effects
 {
     public class FabShadowEffect : RoutingEffect
     {
-        public FabShadowEffect()
-            : base("Bitwarden.FabShadowEffect")
+        public FabShadowEffect() 
+            : base("Bitwarden.FabShadowEffect") 
         { }
     }
 }

src/App/Pages/Accounts/BaseChangePasswordViewModel.cs

@@ -1,12 +1,12 @@
-using System.Collections.Generic;
+using Bit.App.Resources;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using System.Collections.Generic;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
 using Bit.Core.Models.Domain;
-using Bit.Core.Utilities;
 using Xamarin.Essentials;
 
 namespace Bit.App.Pages
@@ -46,11 +46,7 @@ namespace Bit.App.Pages
         {
             get => _showPassword;
             set => SetProperty(ref _showPassword, value,
-                additionalPropertyNames: new[]
-                {
-                    nameof(ShowPasswordIcon),
-                    nameof(PasswordVisibilityAccessibilityText)
-                });
+                additionalPropertyNames: new[] { nameof(ShowPasswordIcon) });
         }
 
         public bool IsPolicyInEffect
@@ -70,9 +66,8 @@ namespace Bit.App.Pages
             get => _policy;
             set => SetProperty(ref _policy, value);
         }
-
+        
         public string ShowPasswordIcon => ShowPassword ? "" : "";
-        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public string MasterPassword { get; set; }
         public string ConfirmMasterPassword { get; set; }
         public string Hint { get; set; }
@@ -89,7 +84,7 @@ namespace Bit.App.Pages
                 await CheckPasswordPolicy();
             }
         }
-
+        
         private async Task CheckPasswordPolicy()
         {
             Policy = await _policyService.GetMasterPasswordPolicyOptions();
@@ -171,7 +166,7 @@ namespace Bit.App.Pages
                     AppResources.AnErrorHasOccurred, AppResources.Ok);
                 return false;
             }
-
+            
             return true;
         }
 

src/App/Pages/Accounts/EnvironmentPage.xaml.cs

@@ -1,8 +1,8 @@
-using System;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using System;
 using System.Threading.Tasks;
 using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages

src/App/Pages/Accounts/EnvironmentPageViewModel.cs

@@ -1,8 +1,8 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Resources;
+using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
+using System;
+using System.Threading.Tasks;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages

src/App/Pages/Accounts/HintPageViewModel.cs

@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
+using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Exceptions;
 using Bit.Core.Utilities;
+using System.Threading.Tasks;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages

src/App/Pages/Accounts/HomePage.xaml.cs

@@ -87,7 +87,7 @@ namespace Bit.App.Pages
         {
             _logo.Source = !ThemeManager.UsingLightTheme ? "logo_white.png" : "logo.png";
         }
-
+        
         private void Cancel_Clicked(object sender, EventArgs e)
         {
             if (DoOnce())
@@ -117,7 +117,7 @@ namespace Bit.App.Pages
                 _vm.StartRegisterAction();
             }
         }
-
+        
         private async Task StartRegisterAsync()
         {
             var page = new RegisterPage(this);
@@ -145,7 +145,7 @@ namespace Bit.App.Pages
                 _vm.StartEnvironmentAction();
             }
         }
-
+        
         private async Task StartEnvironmentAsync()
         {
             await _accountListOverlay.HideAsync();

src/App/Pages/Accounts/LockPage.xaml

@@ -80,8 +80,7 @@
                                 Grid.Column="1"
                                 Grid.RowSpan="2"
                                 AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n ToggleVisibility}" 
-                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
+                                AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                         </Grid>
                         <Grid
                             x:Name="_passwordGrid"
@@ -120,8 +119,7 @@
                                 Grid.Column="1"
                                 Grid.RowSpan="2"
                                 AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                                AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                         </Grid>
                         <StackLayout
                             StyleClass="box-row"

src/App/Pages/Accounts/LockPageViewModel.cs

@@ -72,8 +72,7 @@ namespace Bit.App.Pages
             set => SetProperty(ref _showPassword, value,
                 additionalPropertyNames: new string[]
                 {
-                    nameof(ShowPasswordIcon),
-                    nameof(PasswordVisibilityAccessibilityText),
+                    nameof(ShowPasswordIcon)
                 });
         }
 
@@ -129,7 +128,6 @@ namespace Bit.App.Pages
         public Command SubmitCommand { get; }
         public Command TogglePasswordCommand { get; }
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
-        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public string MasterPassword { get; set; }
         public string Pin { get; set; }
         public Action UnlockedAction { get; set; }
@@ -274,7 +272,7 @@ namespace Bit.App.Pages
                 var key = await _cryptoService.MakeKeyAsync(MasterPassword, _email, kdf, kdfIterations);
                 var storedKeyHash = await _cryptoService.GetKeyHashAsync();
                 var passwordValid = false;
-
+                
                 if (storedKeyHash != null)
                 {
                     passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(MasterPassword, key);

src/App/Pages/Accounts/LoginPage.xaml

@@ -101,8 +101,7 @@
                                 Grid.Column="1"
                                 Grid.RowSpan="2"
                                 AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
+                                AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                         </Grid>
                     </StackLayout>
                     <StackLayout Padding="10, 0">

src/App/Pages/Accounts/LoginPage.xaml.cs

@@ -177,7 +177,7 @@ namespace Bit.App.Pages
             var previousPage = await AppHelpers.ClearPreviousPage();
             Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
         }
-
+        
         private async Task UpdateTempPasswordAsync()
         {
             var page = new UpdateTempPasswordPage();

src/App/Pages/Accounts/LoginPageViewModel.cs

@@ -58,8 +58,7 @@ namespace Bit.App.Pages
             set => SetProperty(ref _showPassword, value,
                 additionalPropertyNames: new string[]
                 {
-                    nameof(ShowPasswordIcon),
-                    nameof(PasswordVisibilityAccessibilityText)
+                    nameof(ShowPasswordIcon)
                 });
         }
 
@@ -68,7 +67,7 @@ namespace Bit.App.Pages
             get => _showCancelButton;
             set => SetProperty(ref _showCancelButton, value);
         }
-
+        
         public string Email
         {
             get => _email;
@@ -86,7 +85,6 @@ namespace Bit.App.Pages
         public Command LogInCommand { get; }
         public Command TogglePasswordCommand { get; }
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
-        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public Action StartTwoFactorAction { get; set; }
         public Action LogInSuccessAction { get; set; }
         public Action UpdateTempPasswordAction { get; set; }

src/App/Pages/Accounts/LoginSsoPage.xaml.cs

@@ -1,9 +1,9 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Models;
-using Bit.App.Utilities;
+using Bit.App.Models;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
+using System;
+using System.Threading.Tasks;
+using Bit.App.Utilities;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -99,7 +99,7 @@ namespace Bit.App.Pages
             var page = new SetPasswordPage(_appOptions, _vm.OrgIdentifier);
             await Navigation.PushModalAsync(new NavigationPage(page));
         }
-
+        
         private async Task UpdateTempPasswordAsync()
         {
             var page = new UpdateTempPasswordPage();

src/App/Pages/Accounts/LoginSsoPageViewModel.cs

@@ -1,13 +1,13 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
+using Bit.App.Abstractions;
 using Bit.App.Resources;
-using Bit.App.Utilities;
 using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using System;
+using System.Threading.Tasks;
+using Bit.App.Utilities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Domain;
-using Bit.Core.Utilities;
 using Xamarin.Essentials;
 using Xamarin.Forms;
 
@@ -170,7 +170,7 @@ namespace Bit.App.Pages
                 else if (response.ResetMasterPassword)
                 {
                     StartSetPasswordAction?.Invoke();
-                }
+                } 
                 else if (response.ForcePasswordReset)
                 {
                     UpdateTempPasswordAction?.Invoke();

src/App/Pages/Accounts/RegisterPage.xaml

@@ -68,8 +68,7 @@
                         Grid.Column="1"
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n ToggleVisibility}" 
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <Label
                     Text="{u:I18n MasterPasswordDescription}"
@@ -107,8 +106,7 @@
                         Grid.Column="1"
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <StackLayout StyleClass="box-row">
                     <Label

src/App/Pages/Accounts/RegisterPage.xaml.cs

@@ -55,7 +55,7 @@ namespace Bit.App.Pages
                 await _vm.SubmitAsync();
             }
         }
-
+        
         private async Task RegistrationSuccessAsync(HomePage homePage)
         {
             if (homePage != null)

src/App/Pages/Accounts/RegisterPageViewModel.cs

@@ -1,14 +1,14 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
+using Bit.App.Abstractions;
 using Bit.App.Resources;
-using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Request;
 using Bit.Core.Utilities;
+using System;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Bit.Core;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -39,7 +39,7 @@ namespace Bit.App.Pages
             SubmitCommand = new Command(async () => await SubmitAsync());
             ShowTerms = !_platformUtilsService.IsSelfHost();
         }
-
+        
         public ICommand PoliciesClickCommand => new Command<string>((url) =>
         {
             _platformUtilsService.LaunchUri(url);
@@ -51,30 +51,28 @@ namespace Bit.App.Pages
             set => SetProperty(ref _showPassword, value,
                 additionalPropertyNames: new string[]
                 {
-                    nameof(ShowPasswordIcon),
-                    nameof(PasswordVisibilityAccessibilityText)
+                    nameof(ShowPasswordIcon)
                 });
         }
-
+        
         public bool AcceptPolicies
         {
             get => _acceptPolicies;
             set => SetProperty(ref _acceptPolicies, value);
         }
-
+        
         public Thickness SwitchMargin
         {
-            get => Device.RuntimePlatform == Device.Android
-                ? new Thickness(0, 0, 0, 0)
+            get => Device.RuntimePlatform == Device.Android 
+                ? new Thickness(0, 0, 0, 0) 
                 : new Thickness(0, 0, 10, 0);
         }
-
+        
         public bool ShowTerms { get; set; }
         public Command SubmitCommand { get; }
         public Command TogglePasswordCommand { get; }
         public Command ToggleConfirmPasswordCommand { get; }
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
-        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public string Name { get; set; }
         public string Email { get; set; }
         public string MasterPassword { get; set; }
@@ -138,7 +136,7 @@ namespace Bit.App.Pages
             }
 
             // TODO: Password strength check?
-
+            
             if (showLoading)
             {
                 await _deviceActionService.ShowLoadingAsync(AppResources.CreatingAccount);

src/App/Pages/Accounts/SetPasswordPage.xaml

@@ -107,8 +107,7 @@
                         Grid.Column="1"
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <Label
                     Text="{u:I18n MasterPasswordDescription}"
@@ -146,8 +145,7 @@
                         Grid.Column="1"
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <StackLayout StyleClass="box-row">
                     <Label

src/App/Pages/Accounts/SetPasswordPageViewModel.cs

@@ -1,17 +1,17 @@
-using System;
+using Bit.App.Abstractions;
+using Bit.App.Resources;
+using Bit.Core.Abstractions;
+using Bit.Core.Enums;
+using Bit.Core.Exceptions;
+using Bit.Core.Models.Request;
+using Bit.Core.Utilities;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
 using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
-using Bit.Core.Exceptions;
 using Bit.Core.Models.Domain;
-using Bit.Core.Models.Request;
-using Bit.Core.Utilities;
 using Xamarin.Essentials;
 using Xamarin.Forms;
 
@@ -55,11 +55,7 @@ namespace Bit.App.Pages
         {
             get => _showPassword;
             set => SetProperty(ref _showPassword, value,
-                additionalPropertyNames: new[]
-                {
-                    nameof(ShowPasswordIcon),
-                    nameof(PasswordVisibilityAccessibilityText)
-                });
+                additionalPropertyNames: new[] { nameof(ShowPasswordIcon) });
         }
 
         public bool IsPolicyInEffect
@@ -67,7 +63,7 @@ namespace Bit.App.Pages
             get => _isPolicyInEffect;
             set => SetProperty(ref _isPolicyInEffect, value);
         }
-
+        
         public bool ResetPasswordAutoEnroll
         {
             get => _resetPasswordAutoEnroll;
@@ -90,7 +86,6 @@ namespace Bit.App.Pages
         public Command TogglePasswordCommand { get; }
         public Command ToggleConfirmPasswordCommand { get; }
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
-        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public string MasterPassword { get; set; }
         public string ConfirmMasterPassword { get; set; }
         public string Hint { get; set; }
@@ -225,7 +220,7 @@ namespace Bit.App.Pages
                     // Enroll user
                     await _apiService.PutOrganizationUserResetPasswordEnrollmentAsync(OrgId, userId, resetRequest);
                 }
-
+                
                 await _deviceActionService.HideLoadingAsync();
                 SetPasswordSuccessAction?.Invoke();
             }

src/App/Pages/Accounts/TwoFactorPage.xaml.cs

@@ -1,11 +1,11 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Controls;
+using Bit.App.Controls;
 using Bit.App.Models;
 using Bit.App.Resources;
-using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
+using System;
+using System.Threading.Tasks;
+using Bit.App.Utilities;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -47,8 +47,7 @@ namespace Bit.App.Pages
             if (Device.RuntimePlatform == Device.iOS)
             {
                 ToolbarItems.Add(_moreItem);
-            }
-            else
+            } else
             {
                 ToolbarItems.Add(_useAnotherTwoStepMethod);
             }
@@ -93,8 +92,7 @@ namespace Bit.App.Pages
                 if (_vm.TotpMethod)
                 {
                     RequestFocus(_totpEntry);
-                }
-                else if (_vm.YubikeyMethod)
+                } else if (_vm.YubikeyMethod)
                 {
                     RequestFocus(_yubikeyTokenEntry);
                 }
@@ -189,7 +187,7 @@ namespace Bit.App.Pages
             var page = new SetPasswordPage(_appOptions, _orgIdentifier);
             await Navigation.PushModalAsync(new NavigationPage(page));
         }
-
+        
         private async Task UpdateTempPasswordAsync()
         {
             var page = new UpdateTempPasswordPage();

src/App/Pages/Accounts/TwoFactorPageViewModel.cs

@@ -1,16 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
+using Bit.App.Abstractions;
 using Bit.App.Resources;
-using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Request;
 using Bit.Core.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using Bit.App.Utilities;
 using Newtonsoft.Json;
 using Xamarin.Essentials;
 using Xamarin.Forms;
@@ -29,7 +29,6 @@ namespace Bit.App.Pages
         private readonly IBroadcasterService _broadcasterService;
         private readonly IStateService _stateService;
         private readonly II18nService _i18nService;
-        private readonly IAppIdService _appIdService;
 
         private TwoFactorProviderType? _selectedProviderType;
         private string _totpInstruction;
@@ -50,7 +49,6 @@ namespace Bit.App.Pages
             _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
             _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
-            _appIdService = ServiceContainer.Resolve<IAppIdService>("appIdService");
 
             PageTitle = AppResources.TwoStepLogin;
             SubmitCommand = new Command(async () => await SubmitAsync());
@@ -115,7 +113,7 @@ namespace Bit.App.Pages
         public Action StartSetPasswordAction { get; set; }
         public Action CloseAction { get; set; }
         public Action UpdateTempPasswordAction { get; set; }
-
+        
         protected override II18nService i18nService => _i18nService;
         protected override IEnvironmentService environmentService => _environmentService;
         protected override IDeviceActionService deviceActionService => _deviceActionService;
@@ -295,7 +293,7 @@ namespace Bit.App.Pages
                     await _deviceActionService.ShowLoadingAsync(AppResources.Validating);
                 }
                 var result = await _authService.LogInTwoFactorAsync(SelectedProviderType.Value, Token, _captchaToken, Remember);
-
+                
                 if (result.CaptchaNeeded)
                 {
                     if (await HandleCaptchaAsync(result.CaptchaSiteKey))
@@ -306,12 +304,12 @@ namespace Bit.App.Pages
                     return;
                 }
                 _captchaToken = null;
-
+                
                 var task = Task.Run(() => _syncService.FullSyncAsync(true));
                 await _deviceActionService.HideLoadingAsync();
                 _messagingService.Send("listenYubiKeyOTP", false);
                 _broadcasterService.Unsubscribe(nameof(TwoFactorPage));
-
+                
                 if (_authingWithSso && result.ResetMasterPassword)
                 {
                     StartSetPasswordAction?.Invoke();
@@ -319,7 +317,7 @@ namespace Bit.App.Pages
                 else if (result.ForcePasswordReset)
                 {
                     UpdateTempPasswordAction?.Invoke();
-                }
+                } 
                 else
                 {
                     TwoFactorAuthSuccessAction?.Invoke();
@@ -382,8 +380,7 @@ namespace Bit.App.Pages
                 var request = new TwoFactorEmailRequest
                 {
                     Email = _authService.Email,
-                    MasterPasswordHash = _authService.MasterPasswordHash,
-                    DeviceIdentifier = await _appIdService.GetAppIdAsync()
+                    MasterPasswordHash = _authService.MasterPasswordHash
                 };
                 await _apiService.PostTwoFactorEmailAsync(request);
                 if (showLoading)

src/App/Pages/Accounts/UpdateTempPasswordPage.xaml

@@ -105,8 +105,7 @@
                         Grid.Column="1"
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
             </StackLayout>
             <StackLayout StyleClass="box">
@@ -141,8 +140,7 @@
                         Grid.Column="1"
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <StackLayout StyleClass="box-row">
                     <Label

src/App/Pages/Accounts/UpdateTempPasswordPage.xaml.cs

@@ -1,7 +1,7 @@
-using System;
-using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
+using System;
+using Bit.App.Resources;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -14,29 +14,29 @@ namespace Bit.App.Pages
         private readonly string _pageName;
 
         public UpdateTempPasswordPage()
-        {
+        {  
             // Service Init
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
-
+            
             // Binding
             InitializeComponent();
             _pageName = string.Concat(nameof(UpdateTempPasswordPage), "_", DateTime.UtcNow.Ticks);
             _vm = BindingContext as UpdateTempPasswordPageViewModel;
             _vm.Page = this;
             SetActivityIndicator();
-
+            
             // Actions Declaration
             _vm.LogOutAction = () =>
             {
                 _messagingService.Send("logout");
             };
             _vm.UpdateTempPasswordSuccessAction = () => Device.BeginInvokeOnMainThread(UpdateTempPasswordSuccess);
-
+            
             // Link fields that will be referenced in codebehind
             MasterPasswordEntry = _masterPassword;
             ConfirmMasterPasswordEntry = _confirmMasterPassword;
-
+            
             // Return Types and Commands
             _masterPassword.ReturnType = ReturnType.Next;
             _masterPassword.ReturnCommand = new Command(() => _confirmMasterPassword.Focus());
@@ -77,7 +77,7 @@ namespace Bit.App.Pages
                 }
             }
         }
-
+        
         private void UpdateTempPasswordSuccess()
         {
             _messagingService.Send("logout");

src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs

@@ -1,6 +1,6 @@
-using System;
-using System.Threading.Tasks;
 using Bit.App.Resources;
+using System;
+using System.Threading.Tasks;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Request;
 using Xamarin.Forms;
@@ -16,7 +16,7 @@ namespace Bit.App.Pages
             ToggleConfirmPasswordCommand = new Command(ToggleConfirmPassword);
             SubmitCommand = new Command(async () => await SubmitAsync());
         }
-
+        
         public Command SubmitCommand { get; }
         public Command TogglePasswordCommand { get; }
         public Command ToggleConfirmPasswordCommand { get; }
@@ -37,23 +37,23 @@ namespace Bit.App.Pages
 
         public async Task SubmitAsync()
         {
-            if (!await ValidateMasterPasswordAsync())
+            if (!await ValidateMasterPasswordAsync()) 
             {
                 return;
             }
-
+            
             // Retrieve details for key generation
             var kdf = await _stateService.GetKdfTypeAsync();
             var kdfIterations = await _stateService.GetKdfIterationsAsync();
             var email = await _stateService.GetEmailAsync();
-
+            
             // Create new key and hash new password
             var key = await _cryptoService.MakeKeyAsync(MasterPassword, email, kdf, kdfIterations);
             var masterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key);
-
+            
             // Create new encKey for the User
             var newEncKey = await _cryptoService.RemakeEncKeyAsync(key);
-
+            
             // Create request
             var request = new UpdateTempPasswordRequest
             {
@@ -61,7 +61,7 @@ namespace Bit.App.Pages
                 NewMasterPasswordHash = masterPasswordHash,
                 MasterPasswordHint = Hint
             };
-
+            
             // Initiate API action
             try
             {

src/App/Pages/Accounts/VerificationCodeViewModel.cs

@@ -36,7 +36,7 @@ namespace Bit.App.Pages
             _logger = ServiceContainer.Resolve<ILogger>("logger");
 
             PageTitle = AppResources.VerificationCode;
-
+            
             TogglePasswordCommand = new Command(TogglePassword);
             MainActionCommand = new AsyncCommand(MainActionAsync, allowsMultipleExecutions: false);
             RequestOTPCommand = new AsyncCommand(RequestOTPAsync, allowsMultipleExecutions: false);
@@ -60,7 +60,7 @@ namespace Bit.App.Pages
             get => _mainActionText;
             set => SetProperty(ref _mainActionText, value);
         }
-
+        
         public string SendCodeStatus
         {
             get => _sendCodeStatus;

src/App/Pages/Authenticator/AuthenticatorPage.xaml

@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<pages:BaseContentPage 
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Bit.App.Pages.AuthenticatorPage"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    xmlns:effects="clr-namespace:Bit.App.Effects"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    x:DataType="pages:AuthenticatorPageViewModel"
-    Title="{Binding PageTitle}"
-    x:Name="_page">
-
-    <ContentPage.BindingContext>
-        <pages:AuthenticatorPageViewModel />
-    </ContentPage.BindingContext>
-
-    <ContentPage.ToolbarItems>
-        <ToolbarItem Icon="search.png" Clicked="Search_Clicked"
-                     AutomationProperties.IsInAccessibleTree="True"
-                     AutomationProperties.Name="{u:I18n Search}" />
-    </ContentPage.ToolbarItems>
-
-    <ContentPage.Resources>
-        <ResourceDictionary>
-            <u:InverseBoolConverter x:Key="inverseBool" />
-
-            <ToolbarItem x:Name="_aboutIconItem" x:Key="aboutIconItem" Icon="info.png"
-                         Clicked="About_Clicked" Order="Primary" Priority="-1"
-                         AutomationProperties.IsInAccessibleTree="True"
-                         AutomationProperties.Name="{u:I18n AboutSend}" />
-            <ToolbarItem x:Name="_syncItem" x:Key="syncItem" Text="{u:I18n Sync}"
-                         Clicked="Sync_Clicked" Order="Secondary" />
-            <ToolbarItem x:Name="_lockItem" x:Key="lockItem" Text="{u:I18n Lock}"
-                         Clicked="Lock_Clicked" Order="Secondary" />
-            <ToolbarItem x:Name="_aboutTextItem" x:Key="aboutTextItem" Text="{u:I18n AboutSend}"
-                         Clicked="About_Clicked" Order="Secondary" />
-            <ToolbarItem x:Name="_addItem" x:Key="addItem" Icon="plus.png"
-                         Clicked="AddButton_Clicked" Order="Primary"
-                         AutomationProperties.IsInAccessibleTree="True"
-                         AutomationProperties.Name="{u:I18n AddItem}" />
-
-            <DataTemplate x:Key="authenticatorTemplate"
-                          x:DataType="pages:AuthenticatorPageListItem">
-                <controls:AuthenticatorViewCell 
-                    Cipher="{Binding Cipher}"
-                    WebsiteIconsEnabled="{Binding BindingContext.WebsiteIconsEnabled, Source={x:Reference _page}}"
-                    TotpSec="{Binding TotpSec}"/>
-            </DataTemplate>
-
-            <StackLayout x:Key="mainLayout" x:Name="_mainLayout">
-                <RefreshView>
-                    <controls:ExtendedCollectionView
-                        ItemsSource="{Binding Items}"
-                        VerticalOptions="FillAndExpand"
-                        SelectionMode="Single"
-                        SelectionChanged="RowSelected"
-                        StyleClass="list, list-platform">
-
-                        <controls:ExtendedCollectionView.ItemTemplate>
-                            <DataTemplate x:DataType="pages:AuthenticatorPageListItem">
-                                <controls:AuthenticatorViewCell />
-                            </DataTemplate>
-                        </controls:ExtendedCollectionView.ItemTemplate>
-
-                    </controls:ExtendedCollectionView>
-                </RefreshView>
-
-            </StackLayout>
-        </ResourceDictionary>
-    </ContentPage.Resources>
-
-
-    <AbsoluteLayout
-        x:Name="_absLayout"
-        VerticalOptions="FillAndExpand"
-        HorizontalOptions="FillAndExpand">
-        <ContentView
-            x:Name="_mainContent"
-            AbsoluteLayout.LayoutFlags="All"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1" />
-        <Button
-            x:Name="_fab"
-            Image="plus.png"
-            Clicked="AddButton_Clicked"
-            Style="{StaticResource btn-fab}"
-            AbsoluteLayout.LayoutFlags="PositionProportional"
-            AbsoluteLayout.LayoutBounds="1, 1, AutoSize, AutoSize"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n AddItem}">
-            <Button.Effects>
-                <effects:FabShadowEffect />
-            </Button.Effects>
-        </Button>
-    </AbsoluteLayout>
-
-</pages:BaseContentPage>

src/App/Pages/Authenticator/AuthenticatorPage.xaml.cs

@@ -1,176 +0,0 @@
-using Bit.App.Resources;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-using Xamarin.Forms.PlatformConfiguration;
-using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
-
-namespace Bit.App.Pages
-{
-    public partial class AuthenticatorPage : BaseContentPage
-    {
-        #region Members
-
-        private readonly IBroadcasterService _broadcasterService;
-        private readonly ISyncService _syncService;
-        private readonly ICipherService _cipherService;
-        private AuthenticatorPageViewModel _vm;
-        private readonly bool _fromTabPage;
-        private readonly Action<string> _selectAction;
-        private readonly TabsPage _tabsPage;
-
-        #endregion
-
-        public AuthenticatorPage(bool fromTabPage, Action<string> selectAction = null, TabsPage tabsPage = null)
-        {
-            //_tabsPage = tabsPage;
-            InitializeComponent();
-            //_broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
-            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
-            _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
-            _vm = BindingContext as AuthenticatorPageViewModel;
-            //_vm.Page = this;
-            //_fromTabPage = fromTabPage;
-            //_selectAction = selectAction;
-
-            if (Device.RuntimePlatform == Device.iOS)
-            {
-                _absLayout.Children.Remove(_fab);
-                ToolbarItems.Add(_aboutIconItem);
-                ToolbarItems.Add(_addItem);
-            }
-            else
-            {
-                ToolbarItems.Add(_syncItem);
-                ToolbarItems.Add(_lockItem);
-                ToolbarItems.Add(_aboutTextItem);
-            }
-        }
-
-        public async Task InitAsync()
-        {
-            await _vm.LoadAsync();
-        }
-
-        protected async override void OnAppearing()
-        {
-            base.OnAppearing();
-            //if (!_fromTabPage)
-            //{
-            //    await InitAsync();
-            //}
-            //_broadcasterService.Subscribe(nameof(GeneratorPage), async (message) =>
-            //{
-            //    if (message.Command == "updatedTheme")
-            //    {
-            //        Device.BeginInvokeOnMainThread(() =>
-            //        {
-            //            //_vm.RedrawPassword();
-            //        });
-            //    }
-            //});
-
-            await LoadOnAppearedAsync(_mainLayout, false, async () =>
-            {
-                if (!_syncService.SyncInProgress || (await _cipherService.GetAllAsync()).Any())
-                {
-                    try
-                    {
-                        await _vm.LoadAsync();
-                    }
-                    catch (Exception e) when (e.Message.Contains("No key."))
-                    {
-                        await Task.Delay(1000);
-                        await _vm.LoadAsync();
-                    }
-                }
-                else
-                {
-                    await Task.Delay(5000);
-                    if (!_vm.Loaded)
-                    {
-                        await _vm.LoadAsync();
-                    }
-                }
-
-                AdjustToolbar();
-                //await CheckAddRequest();
-            }, _mainContent);
-
-        }
-
-        
-
-        private async void Search_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                // var page = new SendsPage(_vm.Filter, _vm.Type != null);
-                // await Navigation.PushModalAsync(new NavigationPage(page));
-            }
-        }
-
-        private async void Sync_Clicked(object sender, EventArgs e)
-        {
-            // await _vm.SyncAsync();
-        }
-
-        private async void Lock_Clicked(object sender, EventArgs e)
-        {
-            // await _vaultTimeoutService.LockAsync(true, true);
-        }
-        
-        private void About_Clicked(object sender, EventArgs e)
-        {
-            // _vm.ShowAbout();
-        }
-
-        private async void AddButton_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                // var page = new SendAddEditPage(null, null, _vm.Type);
-                // await Navigation.PushModalAsync(new NavigationPage(page));
-            }
-        }
-
-        private async void RowSelected(object sender, SelectionChangedEventArgs e)
-        {
-        }
-
-        private async void Copy_Clicked(object sender, EventArgs e)
-        {
-            //await _vm.CopyAsync();
-        }
-
-        private async void More_Clicked(object sender, EventArgs e)
-        {
-            //if (!DoOnce())
-            //{
-            //    return;
-            //}
-            //var selection = await DisplayActionSheet(AppResources.Options, AppResources.Cancel,
-            //    null, AppResources.PasswordHistory);
-            //if (selection == AppResources.PasswordHistory)
-            //{
-            //    var page = new GeneratorHistoryPage();
-            //    await Navigation.PushModalAsync(new Xamarin.Forms.NavigationPage(page));
-            //}
-        }
-
-        protected override void OnDisappearing()
-        {
-            base.OnDisappearing();
-            //_broadcasterService.Unsubscribe(nameof(GeneratorPage));
-        }
-
-        private void AdjustToolbar()
-        {
-            //_addItem.IsEnabled = !_vm.Deleted;
-            //_addItem.IconImageSource = _vm.Deleted ? null : "plus.png";
-        }
-    }
-}

src/App/Pages/Authenticator/AuthenticatorPageListItem.cs

@@ -1,129 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class AuthenticatorPageListItem : ExtendedViewModel
-    {
-        //private string _totpCode;
-        private readonly ITotpService _totpService;
-
-        //public CipherView Cipher { get; set; }
-        //public CipherType? Type { get; set; }
-        //public int interval { get; set; }
-        //public long TotpSec { get; set; }
-        //private DateTime? _totpInterval = null;
-
-        private CipherView _cipher;
-            
-        private bool _websiteIconsEnabled;
-        private string _iconImageSource = string.Empty;
-
-        public int interval { get; set; }
-        private string _totpSec;
-
-        private string _totpCode;
-        private string _totpCodeFormatted = "938 928";
-
-
-        public AuthenticatorPageListItem(CipherView cipherView, bool websiteIconsEnabled)
-        {
-            _totpService = ServiceContainer.Resolve<ITotpService>("totpService");
-
-            Cipher = cipherView;
-            WebsiteIconsEnabled = websiteIconsEnabled;
-            interval = _totpService.GetTimeInterval(Cipher.Login.Totp);
-        }
-
-        
-        public Command CopyCommand { get; set; }
-
-        public CipherView Cipher
-        {
-            get => _cipher;
-            set => SetProperty(ref _cipher, value);
-        }
-
-        public string TotpCodeFormatted
-        {
-            get => _totpCodeFormatted;
-            set => SetProperty(ref _totpCodeFormatted, value);
-        }
-
-        public string TotpSec
-        {
-            get => _totpSec;
-            set => SetProperty(ref _totpSec, value);
-        }
-
-        public bool WebsiteIconsEnabled
-        {
-            get => _websiteIconsEnabled;
-            set => SetProperty(ref _websiteIconsEnabled, value);
-        }
-
-        public bool ShowIconImage
-        {
-            get => WebsiteIconsEnabled
-                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
-                && IconImageSource != null;
-        }
-
-        public string IconImageSource
-        {
-            get
-            {
-                if (_iconImageSource == string.Empty) // default value since icon source can return null
-                {
-                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
-                }
-                return _iconImageSource;
-            }
-
-        }
-
-        public async Task TotpTickAsync()
-        {
-            var epoc = CoreHelpers.EpocUtcNow() / 1000;
-            var mod = epoc % interval;
-            var totpSec = interval - mod;
-            TotpSec = totpSec.ToString();
-            //TotpLow = totpSec < 7;
-            if (mod == 0)
-            {
-                await TotpUpdateCodeAsync();
-            }
-
-        }
-
-        public async Task TotpUpdateCodeAsync()
-        {
-            _totpCode = await _totpService.GetCodeAsync(Cipher.Login.Totp);
-            if (_totpCode != null)
-            {
-                if (_totpCode.Length > 4)
-                {
-                    var half = (int)Math.Floor(_totpCode.Length / 2M);
-                    TotpCodeFormatted = string.Format("{0} {1}", _totpCode.Substring(0, half),
-                        _totpCode.Substring(half));
-                }
-                else
-                {
-                    TotpCodeFormatted = _totpCode;
-                }
-            }
-            else
-            {
-                TotpCodeFormatted = null;
-            }
-        }
-    }
-}

src/App/Pages/Authenticator/AuthenticatorPageViewModel.cs

@@ -1,153 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Linq;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class AuthenticatorPageViewModel : BaseViewModel
-    {
-        #region Members
-
-        private readonly IClipboardService _clipboardService;
-        private readonly ITotpService _totpService;
-        private readonly IUserService _userService;
-        private readonly IVaultTimeoutService _vaultTimeoutService;
-        private readonly ICipherService _cipherService;
-
-        private bool _showList = true;
-        private bool _refreshing;
-        private bool _loaded;
-        private bool _websiteIconsEnabled = true;
-        //private long _totpSec;
-        #endregion
-
-        #region Ctor
-
-        public AuthenticatorPageViewModel()
-        {
-            _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
-            _userService = ServiceContainer.Resolve<IUserService>("userService");
-            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
-            _totpService = ServiceContainer.Resolve<ITotpService>("totpService");
-
-            PageTitle = AppResources.Authenticator;
-            Items = new ExtendedObservableCollection<AuthenticatorPageListItem>();
-        }
-
-        #endregion
-
-        #region Methods
-
-        public async Task CopyAsync()
-        {
-            //await _clipboardService.CopyTextAsync(Password);
-            //_platformUtilsService.ShowToast("success", null,
-            //    string.Format(AppResources.ValueHasBeenCopied, AppResources.Password));
-        }
-
-        public async Task LoadAsync()
-        {
-            var authed = await _userService.IsAuthenticatedAsync();
-            if (!authed)
-            {
-                return;
-            }
-            if (await _vaultTimeoutService.IsLockedAsync())
-            {
-                return;
-            }
-
-            try
-            {
-                await LoadDataAsync();
-            }
-            finally
-            {
-                ShowList = true;
-                Refreshing = false;
-            }
-        }
-
-        private async Task LoadDataAsync()
-        {
-            var _allCiphers = await _cipherService.GetAllDecryptedAsync();
-            _allCiphers = _allCiphers.Where(c => c.Type == Core.Enums.CipherType.Login && c.Login.Totp != null).ToList();
-            var filteredCiphers = _allCiphers.Select(c => new AuthenticatorPageListItem(c, WebsiteIconsEnabled)).ToList();
-            Items.ResetWithRange(filteredCiphers);
-
-            foreach (AuthenticatorPageListItem item in Items)
-            {
-                item.TotpUpdateCodeAsync();
-            }
-
-            //await TotpUpdateCodeAsync();
-            //    var interval = _totpService.GetTimeInterval(Cipher.Login.Totp);
-            //    await TotpTickAsync(interval);
-            //    _totpInterval = DateTime.UtcNow;
-            Device.StartTimer(new TimeSpan(0, 0, 1), () =>
-            {
-                foreach(AuthenticatorPageListItem item in Items)
-                {
-                    item.TotpTickAsync();
-                }
-                return true;
-            });
-            //}
-
-            //private async Task TotpTickAsync(int intervalSeconds)
-            //{
-            //    var epoc = CoreHelpers.EpocUtcNow() / 1000;
-            //    var mod = epoc % intervalSeconds;
-            //    var totpSec = intervalSeconds - mod;
-            //    TotpSec = totpSec.ToString();
-            //    TotpLow = totpSec < 7;
-            //    if (mod == 0)
-            //    {
-            //        await TotpUpdateCodeAsync();
-            //    }
-        }
-
-        #endregion
-
-        #region Properties
-
-        public ExtendedObservableCollection<AuthenticatorPageListItem> Items { get; set; }
-        public Command RefreshCommand { get; set; }
-
-        public bool ShowList
-        {
-            get => _showList;
-            set => SetProperty(ref _showList, value);
-        }
-
-        public bool Refreshing
-        {
-            get => _refreshing;
-            set => SetProperty(ref _refreshing, value);
-        }
-
-        public bool WebsiteIconsEnabled
-        {
-            get => _websiteIconsEnabled;
-            set => SetProperty(ref _websiteIconsEnabled, value);
-        }
-
-        public bool Loaded
-        {
-            get => _loaded;
-            set => SetProperty(ref _loaded, value);
-        }
-        //public long TotpSec
-        //{
-        //    get => _totpSec;
-        //    set => SetProperty(ref _totpSec, value);
-        //}
-
-        #endregion
-    }
-}

src/App/Pages/BaseContentPage.cs

@@ -35,12 +35,12 @@ namespace Bit.App.Pages
         protected async override void OnAppearing()
         {
             base.OnAppearing();
-
+            
             if (IsThemeDirty)
             {
                 UpdateOnThemeChanged();
             }
-
+            
             await SaveActivityAsync();
         }
 

src/App/Pages/CaptchaProtectedViewModel.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
@@ -37,14 +37,11 @@ namespace Bit.App.Pages
             bool cancelled = false;
             try
             {
-                // PrefersEphemeralWebBrowserSession should be false to allow access to the hCaptcha accessibility
-                // cookie set in the default browser
-                // https://www.hcaptcha.com/accessibility
                 var options = new WebAuthenticatorOptions
                 {
                     Url = new Uri(url),
                     CallbackUrl = new Uri(callbackUri),
-                    PrefersEphemeralWebBrowserSession = false,
+                    PrefersEphemeralWebBrowserSession = true,
                 };
                 authResult = await WebAuthenticator.AuthenticateAsync(options);
             }

src/App/Pages/Generator/GeneratorHistoryPage.xaml.cs

@@ -31,8 +31,7 @@ namespace Bit.App.Pages
         {
             base.OnAppearing();
 
-            await LoadOnAppearedAsync(_mainLayout, true, async () =>
-            {
+            await LoadOnAppearedAsync(_mainLayout, true, async () => {
                 await _vm.InitAsync();
             });
         }

src/App/Pages/Generator/GeneratorHistoryPageViewModel.cs

@@ -41,11 +41,8 @@ namespace Bit.App.Pages
         public async Task InitAsync()
         {
             var history = await _passwordGenerationService.GetHistoryAsync();
-            Device.BeginInvokeOnMainThread(() =>
-            {
-                History.ResetWithRange(history ?? new List<GeneratedPasswordHistory>());
-                ShowNoData = History.Count == 0;
-            });
+            History.ResetWithRange(history ?? new List<GeneratedPasswordHistory>());
+            ShowNoData = History.Count == 0;
         }
 
         public async Task ClearAsync()

src/App/Pages/Generator/GeneratorPage.xaml

@@ -183,68 +183,52 @@
                             <Label
                                 Text="A-Z"
                                 StyleClass="box-label-regular"
-                                HorizontalOptions="StartAndExpand" 
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n UppercaseAtoZ}"/>
+                                HorizontalOptions="StartAndExpand" />
                             <Switch
                                 IsToggled="{Binding Uppercase}"
                                 IsEnabled="{Binding EnforcedPolicyOptions.UseUppercase,
                                     Converter={StaticResource inverseBool}}"
                                 StyleClass="box-value"
-                                HorizontalOptions="End" 
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n UppercaseAtoZ}"/>
+                                HorizontalOptions="End" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                         <StackLayout StyleClass="box-row, box-row-switch">
                             <Label
                                 Text="a-z"
                                 StyleClass="box-label-regular"
-                                HorizontalOptions="StartAndExpand" 
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n LowercaseAtoZ}"/>
+                                HorizontalOptions="StartAndExpand" />
                             <Switch
                                 IsToggled="{Binding Lowercase}"
                                 IsEnabled="{Binding EnforcedPolicyOptions.UseLowercase,
                                     Converter={StaticResource inverseBool}}"
                                 StyleClass="box-value"
-                                HorizontalOptions="End"
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n LowercaseAtoZ}" />
+                                HorizontalOptions="End" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                         <StackLayout StyleClass="box-row, box-row-switch">
                             <Label
                                 Text="0-9"
                                 StyleClass="box-label-regular"
-                                HorizontalOptions="StartAndExpand" 
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n NumbersZeroToNine}"/>
+                                HorizontalOptions="StartAndExpand" />
                             <Switch
                                 IsToggled="{Binding Number}"
                                 IsEnabled="{Binding EnforcedPolicyOptions.UseNumbers,
                                     Converter={StaticResource inverseBool}}"
                                 StyleClass="box-value"
-                                HorizontalOptions="End" 
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n NumbersZeroToNine}"/>
+                                HorizontalOptions="End" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                         <StackLayout StyleClass="box-row, box-row-switch">
                             <Label
                                 Text="!@#$%^&amp;*"
                                 StyleClass="box-label-regular"
-                                HorizontalOptions="StartAndExpand" 
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n SpecialCharacters}"/>
+                                HorizontalOptions="StartAndExpand" />
                             <Switch
                                 IsToggled="{Binding Special}"
                                 IsEnabled="{Binding EnforcedPolicyOptions.UseSpecial,
                                     Converter={StaticResource inverseBool}}"
                                 StyleClass="box-value"
-                                HorizontalOptions="End"
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n SpecialCharacters}"/>
+                                HorizontalOptions="End" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                         <StackLayout StyleClass="box-row, box-row-stepper">
@@ -293,7 +277,7 @@
                                 StyleClass="box-label-regular"
                                 HorizontalOptions="StartAndExpand" />
                             <Switch
-                                IsToggled="{Binding AvoidAmbiguousChars}"
+                                IsToggled="{Binding AvoidAmbiguous}"
                                 StyleClass="box-value"
                                 HorizontalOptions="End" />
                         </StackLayout>

src/App/Pages/Generator/GeneratorPage.xaml.cs

@@ -12,7 +12,7 @@ namespace Bit.App.Pages
     public partial class GeneratorPage : BaseContentPage, IThemeDirtablePage
     {
         private readonly IBroadcasterService _broadcasterService;
-
+        
         private GeneratorPageViewModel _vm;
         private readonly bool _fromTabPage;
         private readonly Action<string> _selectAction;
@@ -77,7 +77,7 @@ namespace Bit.App.Pages
                 }
             });
         }
-
+        
         protected override void OnDisappearing()
         {
             base.OnDisappearing();

src/App/Pages/Generator/GeneratorPageViewModel.cs

@@ -1,10 +1,10 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.App.Resources;
+using Bit.App.Resources;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.Domain;
 using Bit.Core.Utilities;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -23,7 +23,7 @@ namespace Bit.App.Pages
         private bool _lowercase;
         private bool _number;
         private bool _special;
-        private bool _allowAmbiguousChars;
+        private bool _avoidAmbiguous;
         private int _minNumber;
         private int _minSpecial;
         private int _length = 5;
@@ -130,29 +130,19 @@ namespace Bit.App.Pages
             }
         }
 
-        public bool AllowAmbiguousChars
+        public bool AvoidAmbiguous
         {
-            get => _allowAmbiguousChars;
+            get => _avoidAmbiguous;
             set
             {
-                if (SetProperty(ref _allowAmbiguousChars, value,
-                    additionalPropertyNames: new string[]
-                    {
-                        nameof(AvoidAmbiguousChars)
-                    }))
+                if (SetProperty(ref _avoidAmbiguous, value))
                 {
-                    _options.AllowAmbiguousChar = value;
+                    _options.Ambiguous = !value;
                     var task = SaveOptionsAsync();
                 }
             }
         }
 
-        public bool AvoidAmbiguousChars
-        {
-            get => !AllowAmbiguousChars;
-            set => AllowAmbiguousChars = !value;
-        }
-
         public int MinNumber
         {
             get => _minNumber;
@@ -235,7 +225,7 @@ namespace Bit.App.Pages
                 }
             }
         }
-
+        
         public PasswordGeneratorPolicyOptions EnforcedPolicyOptions
         {
             get => _enforcedPolicyOptions;
@@ -325,7 +315,7 @@ namespace Bit.App.Pages
 
         private void LoadFromOptions()
         {
-            AllowAmbiguousChars = _options.AllowAmbiguousChar.GetValueOrDefault();
+            AvoidAmbiguous = !_options.Ambiguous.GetValueOrDefault();
             TypeSelectedIndex = _options.Type == "passphrase" ? 1 : 0;
             IsPassword = TypeSelectedIndex == 0;
             MinNumber = _options.MinNumber.GetValueOrDefault();
@@ -343,7 +333,7 @@ namespace Bit.App.Pages
 
         private void SetOptions()
         {
-            _options.AllowAmbiguousChar = AllowAmbiguousChars;
+            _options.Ambiguous = !AvoidAmbiguous;
             _options.Type = TypeSelectedIndex == 1 ? "passphrase" : "password";
             _options.MinNumber = MinNumber;
             _options.MinSpecial = MinSpecial;

src/App/Pages/Send/SendAddEditPage.xaml

@@ -2,7 +2,6 @@
 <pages:BaseContentPage
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
     x:Class="Bit.App.Pages.SendAddEditPage"
     xmlns:pages="clr-namespace:Bit.App.Pages"
     xmlns:u="clr-namespace:Bit.App.Utilities"
@@ -122,7 +121,6 @@
                                     Clicked="FileType_Clicked"
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n File}"
-                                    AutomationProperties.HelpText="{Binding FileTypeAccessibilityLabel}"
                                     Grid.Column="0">
                                 </Button>
                                 <Button
@@ -134,7 +132,6 @@
                                     Clicked="TextType_Clicked"
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n Text}"
-                                    AutomationProperties.HelpText="{Binding TextTypeAccessibilityLabel}"
                                     Grid.Column="1">
                                 </Button>
                             </Grid>
@@ -253,33 +250,29 @@
                         </StackLayout>
                         <StackLayout
                             Orientation="Horizontal"
-                            Spacing="0"
-                            xct:TouchEffect.Command="{Binding ToggleOptionsCommand}"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{Binding OptionsAccessilibityText}">
+                            Spacing="0">
                             <Button
                                 Text="{u:I18n Options}"
                                 x:Name="_btnOptions"
                                 StyleClass="box-row-button"
                                 TextColor="{DynamicResource PrimaryColor}"
-                                Margin="0"
-                                AutomationProperties.IsInAccessibleTree="False"/>
+                                Margin="0" />
                             <controls:IconButton
                                 x:Name="_btnOptionsUp"
                                 Text="{Binding Source={x:Static core:BitwardenIcons.ChevronUp}}"
                                 StyleClass="box-row-button"
                                 TextColor="{DynamicResource PrimaryColor}"
-                                IsVisible="{Binding ShowOptions}" 
-                                AutomationProperties.IsInAccessibleTree="False"/>
+                                Clicked="ToggleOptions_Clicked"
+                                IsVisible="False" />
                             <controls:IconButton
                                 x:Name="_btnOptionsDown"
                                 Text="{Binding Source={x:Static core:BitwardenIcons.AngleDown}}"
                                 StyleClass="box-row-button"
                                 TextColor="{DynamicResource PrimaryColor}"
-                                IsVisible="{Binding ShowOptions, Converter={StaticResource inverseBool}}" 
-                                AutomationProperties.IsInAccessibleTree="False"/>
+                                Clicked="ToggleOptions_Clicked"
+                                IsVisible="False" />
                         </StackLayout>
-                        <StackLayout IsVisible="{Binding ShowOptions}">
+                        <StackLayout IsVisible="True">
                             <StackLayout
                                 StyleClass="box-row"
                                 Margin="0,10,0,0">
@@ -444,8 +437,7 @@
                                         Command="{Binding TogglePasswordCommand}"
                                         Margin="10,0,0,0"
                                         AutomationProperties.IsInAccessibleTree="True"
-                                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                                 </StackLayout>
                                 <Label
                                     Text="{u:I18n PasswordInfo}"

src/App/Pages/Send/SendAddEditPage.xaml.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Bit.App.Models;
@@ -53,9 +53,10 @@ namespace Bit.App.Pages
                 _vm.SegmentedButtonFontSize = 13;
                 _vm.SegmentedButtonMargins = new Thickness(0, 10, 0, 0);
                 _vm.EditorMargins = new Thickness(0, 5, 0, 0);
-                _btnOptions.WidthRequest = 70;
-                _btnOptionsDown.WidthRequest = 30;
-                _btnOptionsUp.WidthRequest = 30;
+                // Review this when https://github.com/bitwarden/mobile/pull/1454 workaround can be reverted
+                //_btnOptions.WidthRequest = 70;
+                //_btnOptionsDown.WidthRequest = 30;
+                //_btnOptionsUp.WidthRequest = 30;
             }
             else if (Device.RuntimePlatform == Device.iOS)
             {
@@ -209,6 +210,11 @@ namespace Bit.App.Pages
             }
         }
 
+        private void ToggleOptions_Clicked(object sender, EventArgs e)
+        {
+            _vm.ToggleOptions();
+        }
+
         private void ClearExpirationDate_Clicked(object sender, EventArgs e)
         {
             if (DoOnce())
@@ -332,10 +338,10 @@ namespace Bit.App.Pages
 
             _vm.IsAddFromShare = true;
             _vm.CopyInsteadOfShareAfterSaving = _appOptions.CopyInsteadOfShareAfterSaving;
-
+            
             var name = _appOptions.CreateSend.Item2;
             _vm.Send.Name = name;
-
+            
             var type = _appOptions.CreateSend.Item1;
             if (type == SendType.File)
             {

src/App/Pages/Send/SendAddEditPageViewModel.cs

@@ -40,12 +40,10 @@ namespace Bit.App.Pages
         private TimeSpan? _expirationTime;
         private bool _isOverridingPickers;
         private int? _maxAccessCount;
-        private string[] _additionalSendProperties = new[]
+        private string[] _additionalSendProperties = new []
         {
             nameof(IsText),
             nameof(IsFile),
-            nameof(FileTypeAccessibilityLabel),
-            nameof(TextTypeAccessibilityLabel)
         };
         private bool _disableHideEmail;
         private bool _sendOptionsPolicyInEffect;
@@ -61,7 +59,6 @@ namespace Bit.App.Pages
             _logger = ServiceContainer.Resolve<ILogger>("logger");
 
             TogglePasswordCommand = new Command(TogglePassword);
-            ToggleOptionsCommand = new Command(ToggleOptions);
 
             TypeOptions = new List<KeyValuePair<string, SendType>>
             {
@@ -92,7 +89,6 @@ namespace Bit.App.Pages
         }
 
         public Command TogglePasswordCommand { get; set; }
-        public Command ToggleOptionsCommand { get; set; }
         public string SendId { get; set; }
         public int SegmentedButtonHeight { get; set; }
         public int SegmentedButtonFontSize { get; set; }
@@ -106,7 +102,6 @@ namespace Bit.App.Pages
         public bool DisableHideEmailControl { get; set; }
         public bool IsAddFromShare { get; set; }
         public string ShareOnSaveText => CopyInsteadOfShareAfterSaving ? AppResources.CopySendLinkOnSave : AppResources.ShareOnSave;
-        public string OptionsAccessilibityText => ShowOptions ? AppResources.OptionsExpanded : AppResources.OptionsCollapsed;
         public List<KeyValuePair<string, SendType>> TypeOptions { get; }
         public List<KeyValuePair<string, string>> DeletionTypeOptions { get; }
         public List<KeyValuePair<string, string>> ExpirationTypeOptions { get; }
@@ -139,11 +134,7 @@ namespace Bit.App.Pages
         public bool ShowOptions
         {
             get => _showOptions;
-            set => SetProperty(ref _showOptions, value,
-                additionalPropertyNames: new[]
-                {
-                    nameof(OptionsAccessilibityText)
-                });
+            set => SetProperty(ref _showOptions, value);
         }
         public int ExpirationDateTypeSelectedIndex
         {
@@ -218,10 +209,9 @@ namespace Bit.App.Pages
         {
             get => _showPassword;
             set => SetProperty(ref _showPassword, value,
-                additionalPropertyNames: new[]
+                additionalPropertyNames: new []
                 {
-                    nameof(ShowPasswordIcon),
-                    nameof(PasswordVisibilityAccessibilityText)
+                    nameof(ShowPasswordIcon)
                 });
         }
         public bool DisableHideEmail
@@ -241,16 +231,13 @@ namespace Bit.App.Pages
         public bool ShowDeletionCustomPickers => EditMode || DeletionDateTypeSelectedIndex == 6;
         public bool ShowExpirationCustomPickers => EditMode || ExpirationDateTypeSelectedIndex == 7;
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
-        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
-        public string FileTypeAccessibilityLabel => IsFile ? AppResources.FileTypeIsSelected : AppResources.FileTypeIsNotSelected;
-        public string TextTypeAccessibilityLabel => IsText ? AppResources.TextTypeIsSelected : AppResources.TextTypeIsNotSelected;
 
         public async Task InitAsync()
         {
             PageTitle = EditMode ? AppResources.EditSend : AppResources.AddSend;
             _canAccessPremium = await _stateService.CanAccessPremiumAsync();
             _emailVerified = await _stateService.GetEmailVerifiedAsync();
-            SendEnabled = !await AppHelpers.IsSendDisabledByPolicyAsync();
+            SendEnabled = ! await AppHelpers.IsSendDisabledByPolicyAsync();
             DisableHideEmail = await AppHelpers.IsHideEmailDisabledByPolicyAsync();
             SendOptionsPolicyInEffect = SendEnabled && DisableHideEmail;
         }
@@ -394,7 +381,7 @@ namespace Bit.App.Pages
 
             UpdateSendData();
 
-            if (string.IsNullOrWhiteSpace(NewPassword))
+            if (string.IsNullOrWhiteSpace(NewPassword)) 
             {
                 NewPassword = null;
             }
@@ -534,7 +521,7 @@ namespace Bit.App.Pages
                     {
                         await _platformUtilsService.ShowDialogAsync(AppResources.SendFileEmailVerificationRequired);
                     }
-
+                    
                     if (IsAddFromShare && Device.RuntimePlatform == Device.Android)
                     {
                         _deviceActionService.CloseMainApp();

src/App/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Bit.App.Controls;
@@ -133,7 +133,7 @@ namespace Bit.App.Pages
                 }
             }
         }
-
+        
         private async void RowSelected(object sender, SelectionChangedEventArgs e)
         {
             ((ExtendedCollectionView)sender).SelectedItem = null;
@@ -160,7 +160,7 @@ namespace Bit.App.Pages
         {
             if (DoOnce())
             {
-                var page = new SendsPage(_vm.Filter, _vm.Type);
+                var page = new SendsPage(_vm.Filter, _vm.Type != null);
                 await Navigation.PushModalAsync(new NavigationPage(page));
             }
         }
@@ -174,7 +174,7 @@ namespace Bit.App.Pages
         {
             await _vaultTimeoutService.LockAsync(true, true);
         }
-
+        
         private void About_Clicked(object sender, EventArgs e)
         {
             _vm.ShowAbout();

src/App/Pages/Send/SendGroupingsPage/SendGroupingsPageHeaderListItem.cs

@@ -9,6 +9,6 @@
         }
 
         public string Title { get; }
-        public string ItemCount { get; }
+        public string ItemCount { get;  }
     }
 }

src/App/Pages/Send/SendGroupingsPage/SendGroupingsPageViewModel.cs

@@ -136,7 +136,7 @@ namespace Bit.App.Pages
             ShowNoData = false;
             Loading = true;
             ShowList = false;
-            SendEnabled = !await AppHelpers.IsSendDisabledByPolicyAsync();
+            SendEnabled = ! await AppHelpers.IsSendDisabledByPolicyAsync();
             var groupedSends = new List<SendGroupingsPageListGroup>();
             var page = Page as SendGroupingsPage;
 

src/App/Pages/Send/SendsPage.xaml.cs

@@ -2,7 +2,6 @@
 using System.Linq;
 using Bit.App.Controls;
 using Bit.App.Resources;
-using Bit.Core.Enums;
 using Bit.Core.Models.View;
 using Xamarin.Forms;
 
@@ -13,22 +12,15 @@ namespace Bit.App.Pages
         private SendsPageViewModel _vm;
         private bool _hasFocused;
 
-        public SendsPage(Func<SendView, bool> filter, SendType? type = null)
+        public SendsPage(Func<SendView, bool> filter, bool type = false)
         {
             InitializeComponent();
             _vm = BindingContext as SendsPageViewModel;
             _vm.Page = this;
             _vm.Filter = filter;
-            if (type != null)
+            if (type)
             {
-                if (type == SendType.File)
-                {
-                    _vm.PageTitle = AppResources.SearchFileSends;
-                }
-                else if (type == SendType.Text)
-                {
-                    _vm.PageTitle = AppResources.SearchTextSends;
-                }
+                _vm.PageTitle = AppResources.SearchType;
             }
             else
             {
@@ -41,7 +33,6 @@ namespace Bit.App.Pages
                 _searchBar.Placeholder = AppResources.Search;
                 _mainLayout.Children.Insert(0, _searchBar);
                 _mainLayout.Children.Insert(1, _separator);
-                ShowModalAnimationDelay = 0;
             }
             else
             {

src/App/Pages/Send/SendsPageViewModel.cs

@@ -35,11 +35,11 @@ namespace Bit.App.Pages
             get => _sendEnabled;
             set => SetProperty(ref _sendEnabled, value);
         }
-
+        
         public bool ShowNoData
         {
             get => _showNoData;
-            set => SetProperty(ref _showNoData, value, additionalPropertyNames: new[]
+            set => SetProperty(ref _showNoData, value, additionalPropertyNames: new []
             {
                 nameof(ShowSearchDirection)
             });
@@ -48,7 +48,7 @@ namespace Bit.App.Pages
         public bool ShowList
         {
             get => _showList;
-            set => SetProperty(ref _showList, value, additionalPropertyNames: new[]
+            set => SetProperty(ref _showList, value, additionalPropertyNames: new []
             {
                 nameof(ShowSearchDirection)
             });
@@ -58,7 +58,7 @@ namespace Bit.App.Pages
 
         public async Task InitAsync()
         {
-            SendEnabled = !await AppHelpers.IsSendDisabledByPolicyAsync();
+            SendEnabled = ! await AppHelpers.IsSendDisabledByPolicyAsync();
             if (!string.IsNullOrWhiteSpace((Page as SendsPage).SearchBar.Text))
             {
                 Search((Page as SendsPage).SearchBar.Text, 200);

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

@@ -49,12 +49,12 @@ namespace Bit.App.Pages
                 _vm.ToggleAutofillService();
             }
         }
-
+        
         private void ToggleInlineAutofill(object sender, EventArgs e)
         {
             _vm.ToggleInlineAutofill();
         }
-
+        
         private void ToggleAccessibility(object sender, EventArgs e)
         {
             if (DoOnce())
@@ -62,7 +62,7 @@ namespace Bit.App.Pages
                 _vm.ToggleAccessibility();
             }
         }
-
+        
         private void ToggleDrawOver(object sender, EventArgs e)
         {
             if (DoOnce())

src/App/Pages/Settings/AutofillServicesPageViewModel.cs

@@ -12,7 +12,7 @@ namespace Bit.App.Pages
         private readonly IDeviceActionService _deviceActionService;
         private readonly IStateService _stateService;
         private readonly MobileI18nService _i18nService;
-
+        
         private bool _autofillServiceToggled;
         private bool _inlineAutofillToggled;
         private bool _accessibilityToggled;
@@ -26,9 +26,9 @@ namespace Bit.App.Pages
             _i18nService = ServiceContainer.Resolve<II18nService>("i18nService") as MobileI18nService;
             PageTitle = AppResources.AutofillServices;
         }
-
+        
         #region Autofill Service
-
+        
         public bool AutofillServiceVisible
         {
             get => _deviceActionService.SystemMajorVersion() >= 26;
@@ -43,16 +43,16 @@ namespace Bit.App.Pages
                     nameof(InlineAutofillEnabled)
                 });
         }
-
+        
         #endregion
-
+        
         #region Inline Autofill
 
         public bool InlineAutofillVisible
         {
             get => _deviceActionService.SystemMajorVersion() >= 30;
         }
-
+        
         public bool InlineAutofillEnabled
         {
             get => AutofillServiceToggled;
@@ -69,9 +69,9 @@ namespace Bit.App.Pages
                 }
             }
         }
-
+        
         #endregion
-
+        
         #region Accessibility
 
         public string AccessibilityDescriptionLabel
@@ -97,7 +97,7 @@ namespace Bit.App.Pages
                 return _i18nService.T("AccessibilityDescription4");
             }
         }
-
+        
         public bool AccessibilityToggled
         {
             get => _accessibilityToggled;
@@ -109,9 +109,9 @@ namespace Bit.App.Pages
         }
 
         #endregion
-
+        
         #region Draw-Over
-
+        
         public bool DrawOverVisible
         {
             get => _deviceActionService.SystemMajorVersion() >= 23;
@@ -135,12 +135,12 @@ namespace Bit.App.Pages
                 return _i18nService.T("DrawOverDescription3");
             }
         }
-
+        
         public bool DrawOverEnabled
         {
             get => AccessibilityToggled;
         }
-
+        
         public bool DrawOverToggled
         {
             get => _drawOverToggled;
@@ -148,7 +148,7 @@ namespace Bit.App.Pages
         }
 
         #endregion
-
+        
         public async Task InitAsync()
         {
             InlineAutofillToggled = await _stateService.GetInlineAutofillEnabledAsync() ?? true;
@@ -189,15 +189,14 @@ namespace Bit.App.Pages
             }
             _deviceActionService.OpenAccessibilityOverlayPermissionSettings();
         }
-
+        
         public void UpdateEnabled()
         {
-            AutofillServiceToggled =
-                _deviceActionService.HasAutofillService() && _deviceActionService.AutofillServiceEnabled();
+            AutofillServiceToggled = _deviceActionService.AutofillServiceEnabled();
             AccessibilityToggled = _deviceActionService.AutofillAccessibilityServiceRunning();
             DrawOverToggled = _deviceActionService.AutofillAccessibilityOverlayPermitted();
         }
-
+        
         private async Task UpdateInlineAutofillToggledAsync()
         {
             if (_inited)

src/App/Pages/Settings/ExportVaultPage.xaml

@@ -105,7 +105,6 @@
                         Grid.Column="1"
                         AutomationProperties.IsInAccessibleTree="True"
                         AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
                         IsVisible="{Binding UseOTPVerification, Converter={StaticResource inverseBool}}"/>
                     <Label
                         Text="{u:I18n ConfirmYourIdentity}"

src/App/Pages/Settings/ExportVaultPageViewModel.cs

@@ -4,11 +4,11 @@ using System.Text;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
-using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Utilities;
+using Bit.Core;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -77,7 +77,7 @@ namespace Bit.App.Pages
                 InstructionText = _i18nService.T("ExportVaultMasterPasswordDescription");
                 SecretName = _i18nService.T("MasterPassword");
             }
-
+            
             UpdateWarning();
         }
 
@@ -109,11 +109,7 @@ namespace Bit.App.Pages
         {
             get => _showPassword;
             set => SetProperty(ref _showPassword, value,
-                additionalPropertyNames: new string[]
-                {
-                    nameof(ShowPasswordIcon),
-                    nameof(PasswordVisibilityAccessibilityText),
-                });
+                additionalPropertyNames: new string[] {nameof(ShowPasswordIcon)});
         }
 
         public bool UseOTPVerification
@@ -143,7 +139,6 @@ namespace Bit.App.Pages
         public Command TogglePasswordCommand { get; }
 
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
-        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
 
         public void TogglePassword()
         {

src/App/Pages/Settings/ExtensionPageViewModel.cs

@@ -1,7 +1,7 @@
-using System.Threading.Tasks;
-using Bit.App.Resources;
+using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
+using System.Threading.Tasks;
 
 namespace Bit.App.Pages
 {

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

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
-using Bit.App.Resources;
+using Bit.App.Resources;
+using System.Collections.Generic;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages

src/App/Pages/Settings/FolderAddEditPageViewModel.cs

@@ -1,10 +1,10 @@
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
+using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
+using System.Threading.Tasks;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages

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

@@ -1,7 +1,7 @@
-using System;
+using Bit.Core.Models.View;
+using System;
 using System.Linq;
 using Bit.App.Controls;
-using Bit.Core.Models.View;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages

src/App/Pages/Settings/FoldersPageViewModel.cs

@@ -1,10 +1,10 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.App.Resources;
+using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace Bit.App.Pages
 {

src/App/Pages/Settings/OptionsPageViewModel.cs

@@ -1,11 +1,11 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.App.Resources;
+using Bit.App.Resources;
 using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages

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

@@ -59,7 +59,7 @@ namespace Bit.App.Pages
 
         async void OnTimePickerPropertyChanged(object sender, PropertyChangedEventArgs args)
         {
-            var s = (TimePicker)sender;
+            var s = (TimePicker) sender;
             var time = s.Time.TotalMinutes;
             if (s.IsFocused && args.PropertyName == "Time")
             {
@@ -167,10 +167,6 @@ namespace Bit.App.Pages
             {
                 await _vm.UpdatePinAsync();
             }
-            else if (item.Name == AppResources.ReportCrashLogs)
-            {
-                await _vm.LoggerReportingAsync();
-            }
             else
             {
                 var biometricName = AppResources.Biometrics;

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

@@ -1,16 +1,16 @@
-using System;
+using Bit.App.Abstractions;
+using Bit.App.Resources;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Models.Domain;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
+using ZXing.Client.Result;
+using Xamarin.CommunityToolkit.ObjectModel;
 
 namespace Bit.App.Pages
 {
@@ -29,7 +29,7 @@ namespace Bit.App.Pages
         private readonly ILocalizeService _localizeService;
         private readonly IKeyConnectorService _keyConnectorService;
         private readonly IClipboardService _clipboardService;
-        private readonly ILogger _loggerService;
+
         private const int CustomVaultTimeoutValue = -100;
 
         private bool _supportsBiometric;
@@ -39,7 +39,6 @@ namespace Bit.App.Pages
         private string _vaultTimeoutDisplayValue;
         private string _vaultTimeoutActionDisplayValue;
         private bool _showChangeMasterPassword;
-        private bool _reportLoggingEnabled;
 
         private List<KeyValuePair<string, int?>> _vaultTimeouts =
             new List<KeyValuePair<string, int?>>
@@ -80,7 +79,6 @@ namespace Bit.App.Pages
             _localizeService = ServiceContainer.Resolve<ILocalizeService>("localizeService");
             _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
             _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
-            _loggerService = ServiceContainer.Resolve<ILogger>("logger");
 
             GroupedItems = new ObservableRangeCollection<ISettingsPageListItem>();
             PageTitle = AppResources.Settings;
@@ -125,7 +123,7 @@ namespace Bit.App.Pages
 
             _showChangeMasterPassword = IncludeLinksWithSubscriptionInfo() &&
                 !await _keyConnectorService.GetUsesKeyConnector();
-            _reportLoggingEnabled = await _loggerService.IsEnabled();
+
             BuildList();
         }
 
@@ -288,26 +286,6 @@ namespace Bit.App.Pages
             }
         }
 
-        public async Task LoggerReportingAsync()
-        {
-            var options = new[]
-            {
-                    CreateSelectableOption(AppResources.Yes, _reportLoggingEnabled),
-                    CreateSelectableOption(AppResources.No, !_reportLoggingEnabled),
-            };
-
-            var selection = await Page.DisplayActionSheet(AppResources.ReportCrashLogsDescription, AppResources.Cancel, null, options);
-
-            if (selection == null || selection == AppResources.Cancel)
-            {
-                return;
-            }
-
-            await _loggerService.SetEnabled(CompareSelection(selection, AppResources.Yes));
-            _reportLoggingEnabled = await _loggerService.IsEnabled();
-            BuildList();
-        }
-
         public async Task VaultTimeoutActionAsync()
         {
             var options = _vaultTimeoutActions.Select(o =>
@@ -450,7 +428,7 @@ namespace Bit.App.Pages
             var securityItems = new List<SettingsPageListItem>
             {
                 new SettingsPageListItem { Name = AppResources.VaultTimeout, SubLabel = _vaultTimeoutDisplayValue },
-                new SettingsPageListItem
+                new SettingsPageListItem 
                 {
                     Name = AppResources.VaultTimeoutAction,
                     SubLabel = _vaultTimeoutActionDisplayValue
@@ -516,19 +494,11 @@ namespace Bit.App.Pages
                 toolsItems.Add(new SettingsPageListItem { Name = AppResources.LearnOrg });
                 toolsItems.Add(new SettingsPageListItem { Name = AppResources.WebVault });
             }
-
             var otherItems = new List<SettingsPageListItem>
             {
                 new SettingsPageListItem { Name = AppResources.Options },
                 new SettingsPageListItem { Name = AppResources.About },
                 new SettingsPageListItem { Name = AppResources.HelpAndFeedback },
-#if !FDROID 
-                new SettingsPageListItem
-                {
-                    Name = AppResources.ReportCrashLogs,
-                    SubLabel = _reportLoggingEnabled ? AppResources.Enabled : AppResources.Disabled,
-                },
-#endif
                 new SettingsPageListItem { Name = AppResources.RateTheApp },
                 new SettingsPageListItem { Name = AppResources.DeleteAccount }
             };
@@ -606,9 +576,5 @@ namespace Bit.App.Pages
         {
             return _vaultTimeouts.FirstOrDefault(o => o.Key == key).Value;
         }
-
-        private string CreateSelectableOption(string option, bool selected) => selected ? $"✓ {option}" : option;
-
-        private bool CompareSelection(string selection, string compareTo) => selection == compareTo || selection == $"✓ {compareTo}";
     }
 }

src/App/Pages/Settings/SyncPageViewModel.cs

@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
+using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Exceptions;
 using Bit.Core.Utilities;
+using System.Threading.Tasks;
 
 namespace Bit.App.Pages
 {

src/App/Pages/TabsPage.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Effects;
+using Bit.App.Effects;
 using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
@@ -12,19 +10,15 @@ namespace Bit.App.Pages
 {
     public class TabsPage : TabbedPage
     {
-        private readonly IBroadcasterService _broadcasterService;
         private readonly IMessagingService _messagingService;
         private readonly IKeyConnectorService _keyConnectorService;
-        private readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
-
+        
         private NavigationPage _groupingsPage;
-        private NavigationPage _authenticatorPage;
         private NavigationPage _sendGroupingsPage;
         private NavigationPage _generatorPage;
 
         public TabsPage(AppOptions appOptions = null, PreviousPageInfo previousPage = null)
         {
-            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
             _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
 
@@ -33,16 +27,8 @@ namespace Bit.App.Pages
                 Title = AppResources.MyVault,
                 IconImageSource = "lock.png"
             };
-
             Children.Add(_groupingsPage);
 
-            _authenticatorPage = new NavigationPage(new AuthenticatorPage(true, null, this))
-            {
-                Title = AppResources.Authenticator,
-                IconImageSource = "info.png"
-            };
-            Children.Add(_authenticatorPage);
-
             _sendGroupingsPage = new NavigationPage(new SendGroupingsPage(true, null, null, appOptions))
             {
                 Title = AppResources.Send,
@@ -92,26 +78,12 @@ namespace Bit.App.Pages
         protected override async void OnAppearing()
         {
             base.OnAppearing();
-            _broadcasterService.Subscribe(nameof(TabsPage), async (message) =>
-            {
-                if (message.Command == "syncCompleted")
-                {
-                    Device.BeginInvokeOnMainThread(async () => await UpdateVaultButtonTitleAsync());
-                }
-            });
-            await UpdateVaultButtonTitleAsync();
             if (await _keyConnectorService.UserNeedsMigration())
             {
                 _messagingService.Send("convertAccountToKeyConnector");
             }
         }
 
-        protected override void OnDisappearing()
-        {
-            base.OnDisappearing();
-            _broadcasterService.Unsubscribe(nameof(TabsPage));
-        }
-
         public void ResetToVaultPage()
         {
             CurrentPage = _groupingsPage;
@@ -121,7 +93,7 @@ namespace Bit.App.Pages
         {
             CurrentPage = _generatorPage;
         }
-
+        
         public void ResetToSendPage()
         {
             CurrentPage = _sendGroupingsPage;
@@ -159,19 +131,5 @@ namespace Bit.App.Pages
                 groupingsPage.HideAccountSwitchingOverlayAsync().FireAndForget();
             }
         }
-
-        private async Task UpdateVaultButtonTitleAsync()
-        {
-            try
-            {
-                var policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
-                var isShowingVaultFilter = await policyService.ShouldShowVaultFilterAsync();
-                _groupingsPage.Title = isShowingVaultFilter ? AppResources.Vaults : AppResources.MyVault;
-            }
-            catch (Exception ex)
-            {
-                _logger.Value.Exception(ex);
-            }
-        }
     }
 }

src/App/Pages/Vault/AddEditPage.xaml

@@ -162,7 +162,6 @@
                             Grid.RowSpan="2"
                             AutomationProperties.IsInAccessibleTree="True"
                             AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                            AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
                             IsVisible="{Binding Cipher.ViewPassword}" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
@@ -733,6 +732,7 @@
                     <BoxView StyleClass="box-row-separator" />
                 </StackLayout>
                 <controls:RepeaterView 
+                    x:Name="_collectionsRepeaterView" 
                     ItemsSource="{Binding Collections}"
                     IsVisible="{Binding HasCollections}">
                     <controls:RepeaterView.ItemTemplate>

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

@@ -1,12 +1,12 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
+using Bit.App.Abstractions;
 using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using Xamarin.Essentials;
 using Xamarin.Forms;
 using Xamarin.Forms.PlatformConfiguration;
@@ -51,6 +51,7 @@ namespace Bit.App.Pages
             _vm.CipherId = cipherId;
             _vm.FolderId = folderId == "none" ? null : folderId;
             _vm.CollectionIds = collectionId != null ? new HashSet<string>(new List<string> { collectionId }) : null;
+            _vm.CollectionsRepeaterView = _collectionsRepeaterView;
             _vm.Type = type;
             _vm.DefaultName = name ?? appOptions?.SaveName;
             _vm.DefaultUri = uri ?? appOptions?.Uri;
@@ -170,6 +171,7 @@ namespace Bit.App.Pages
                 {
                     RequestFocus(_nameEntry);
                 }
+                _scrollView.Scrolled += (sender, args) => _vm.HandleScroll();
             });
             // Hide password reprompt option if using key connector
             _passwordPrompt.IsVisible = !await _keyConnectorService.GetUsesKeyConnector();

src/App/Pages/Vault/AddEditPageViewModel.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
+using Bit.App.Controls;
 using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.Core;
@@ -43,6 +44,7 @@ namespace Bit.App.Pages
         private int _ownershipSelectedIndex;
         private bool _hasCollections;
         private string _previousCipherId;
+        private DateTime _lastHandledScrollTime;
         private List<Core.Models.View.CollectionView> _writeableCollections;
         private string[] _additionalCipherProperties = new string[]
         {
@@ -65,7 +67,7 @@ namespace Bit.App.Pages
                 new KeyValuePair<UriMatchType?, string>(UriMatchType.Exact, AppResources.Exact),
                 new KeyValuePair<UriMatchType?, string>(UriMatchType.Never, AppResources.Never)
             };
-
+        
         public AddEditPageViewModel()
         {
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
@@ -166,7 +168,7 @@ namespace Bit.App.Pages
         public ExtendedObservableCollection<LoginUriView> Uris { get; set; }
         public ExtendedObservableCollection<AddEditPageFieldViewModel> Fields { get; set; }
         public ExtendedObservableCollection<CollectionViewModel> Collections { get; set; }
-
+        public RepeaterView CollectionsRepeaterView { get; set; }
         public int TypeSelectedIndex
         {
             get => _typeSelectedIndex;
@@ -249,8 +251,7 @@ namespace Bit.App.Pages
             set => SetProperty(ref _showPassword, value,
                 additionalPropertyNames: new string[]
                 {
-                    nameof(ShowPasswordIcon),
-                    nameof(PasswordVisibilityAccessibilityText)
+                    nameof(ShowPasswordIcon)
                 });
         }
         public bool ShowCardNumber
@@ -299,7 +300,6 @@ namespace Bit.App.Pages
         public int TotpColumnSpan => Cipher.ViewPassword ? 1 : 2;
         public bool AllowPersonal { get; set; }
         public bool PasswordPrompt => Cipher.Reprompt != CipherRepromptType.None;
-        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
 
         public void Init()
         {
@@ -352,7 +352,7 @@ namespace Bit.App.Pages
                     {
                         Cipher.Name += " - " + AppResources.Clone;
                         // If not allowing personal ownership, update cipher's org Id to prompt downstream changes
-                        if (Cipher.OrganizationId == null && !AllowPersonal)
+                        if (Cipher.OrganizationId == null && !AllowPersonal) 
                         {
                             Cipher.OrganizationId = OrganizationId;
                         }
@@ -401,7 +401,7 @@ namespace Bit.App.Pages
                     IdentityTitleOptions.FindIndex(k => k.Value == Cipher.Identity.Title);
                 OwnershipSelectedIndex = string.IsNullOrWhiteSpace(Cipher.OrganizationId) ? 0 :
                     OwnershipOptions.FindIndex(k => k.Value == Cipher.OrganizationId);
-
+                
                 // If the selected organization is on Index 0 and we've removed the personal option, force refresh
                 if (!AllowPersonal && OwnershipSelectedIndex == 0)
                 {
@@ -453,11 +453,11 @@ namespace Bit.App.Pages
                     AppResources.Ok);
                 return false;
             }
-
+            
             if ((!EditMode || CloneMode) && !AllowPersonal && string.IsNullOrWhiteSpace(Cipher.OrganizationId))
             {
                 await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
-                    AppResources.PersonalOwnershipSubmitError, AppResources.Ok);
+                    AppResources.PersonalOwnershipSubmitError,AppResources.Ok);
                 return false;
             }
 
@@ -537,7 +537,7 @@ namespace Bit.App.Pages
                         AppResources.AnErrorHasOccurred);
                 }
             }
-            catch (Exception genex)
+            catch(Exception genex)
             {
                 _logger.Exception(genex);
                 await _deviceActionService.HideLoadingAsync();
@@ -821,13 +821,30 @@ namespace Bit.App.Pages
             {
                 var cols = _writeableCollections.Where(c => c.OrganizationId == Cipher.OrganizationId)
                     .Select(c => new CollectionViewModel { Collection = c }).ToList();
+                HasCollections = cols.Any();
                 Collections.ResetWithRange(cols);
+                Collections = new ExtendedObservableCollection<CollectionViewModel>(cols);
             }
             else
             {
+                HasCollections = false;
                 Collections.ResetWithRange(new List<CollectionViewModel>());
+                Collections = new ExtendedObservableCollection<CollectionViewModel>(new List<CollectionViewModel>());
             }
-            HasCollections = Collections.Any();
+        }
+
+        public void HandleScroll()
+        {
+            // workaround for https://github.com/xamarin/Xamarin.Forms/issues/13607
+            // required for org ownership/collections to render properly in XF4.5+
+            if (!HasCollections ||
+                EditMode ||
+                (DateTime.Now - _lastHandledScrollTime < TimeSpan.FromMilliseconds(200)))
+            {
+                return;
+            }
+            CollectionsRepeaterView.ItemsSource = Collections;
+            _lastHandledScrollTime = DateTime.Now;
         }
 
         private void TriggerCipherChanged()

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

@@ -1,6 +1,6 @@
-using System;
-using Bit.Core.Abstractions;
+using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
+using System;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages

src/App/Pages/Vault/AttachmentsPageViewModel.cs

@@ -1,13 +1,13 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
+using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Domain;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages

src/App/Pages/Vault/AutofillCiphersPage.xaml

@@ -15,18 +15,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
-        <controls:ExtendedToolbarItem
-            x:Name="_accountAvatar"
-            IconImageSource="{Binding AvatarImageSource}"
-            Command="{Binding Source={x:Reference _accountListOverlay}, Path=ToggleVisibililtyCommand}"
-            Order="Primary"
-            Priority="-1"
-            UseOriginalImage="True"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Account}" />
-        <ToolbarItem Icon="search.png" Clicked="Search_Clicked"
-                     AutomationProperties.IsInAccessibleTree="True"
-                     AutomationProperties.Name="{u:I18n Search}" />
+        <ToolbarItem Icon="search.png" Clicked="Search_Clicked" />
     </ContentPage.ToolbarItems>
 
     <ContentPage.Resources>
@@ -69,7 +58,7 @@
                     VerticalOptions="CenterAndExpand"
                     Padding="20, 0"
                     Spacing="20"
-                    IsVisible="{Binding ShowNoData}">
+                    IsVisible="{Binding ShowList, Converter={StaticResource inverseBool}}">
                     <Label
                         Text="{Binding NoDataText}"
                         HorizontalTextAlignment="Center"></Label>
@@ -99,8 +88,6 @@
             AbsoluteLayout.LayoutFlags="All"
             AbsoluteLayout.LayoutBounds="0, 0, 1, 1">
         </ContentView>
-        
-        <!-- Android FAB -->
         <Button
             x:Name="_fab"
             Image="plus.png"
@@ -112,14 +99,6 @@
                 <effects:FabShadowEffect />
             </Button.Effects>
         </Button>
-        
-        <controls:AccountSwitchingOverlayView
-            x:Name="_accountListOverlay"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1"
-            AbsoluteLayout.LayoutFlags="All"
-            MainPage="{Binding Source={x:Reference _page}}"
-            MainFab="{Binding Source={x:Reference _fab}, Path=.}"
-            BindingContext="{Binding AccountSwitchingOverlayViewModel}"/>
     </AbsoluteLayout>
 
 </pages:BaseContentPage>

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

@@ -1,12 +1,13 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.App.Controls;
-using Bit.App.Models;
-using Bit.App.Utilities;
+using Bit.App.Models;
+using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Bit.App.Controls;
+using Bit.App.Utilities;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -14,8 +15,7 @@ namespace Bit.App.Pages
     public partial class AutofillCiphersPage : BaseContentPage
     {
         private readonly AppOptions _appOptions;
-        private readonly IBroadcasterService _broadcasterService;
-        private readonly ISyncService _syncService;
+        private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IVaultTimeoutService _vaultTimeoutService;
 
         private AutofillCiphersPageViewModel _vm;
@@ -24,23 +24,17 @@ namespace Bit.App.Pages
         {
             _appOptions = appOptions;
             InitializeComponent();
-            SetActivityIndicator(_mainContent);
             _vm = BindingContext as AutofillCiphersPageViewModel;
             _vm.Page = this;
             _vm.Init(appOptions);
 
-            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
-            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
         }
 
         protected async override void OnAppearing()
         {
             base.OnAppearing();
-            if (_syncService.SyncInProgress)
-            {
-                IsBusy = true;
-            }
             if (!await AppHelpers.IsVaultTimeoutImmediateAsync())
             {
                 await _vaultTimeoutService.CheckVaultTimeoutAsync();
@@ -49,37 +43,13 @@ namespace Bit.App.Pages
             {
                 return;
             }
-
-            _accountAvatar?.OnAppearing();
-            _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
-
-            _broadcasterService.Subscribe(nameof(AutofillCiphersPage), async (message) =>
-            {
-                if (message.Command == "syncStarted")
-                {
-                    Device.BeginInvokeOnMainThread(() => IsBusy = true);
-                }
-                else if (message.Command == "syncCompleted")
-                {
-                    await Task.Delay(500);
-                    Device.BeginInvokeOnMainThread(() =>
-                    {
-                        IsBusy = false;
-                        if (_vm.LoadedOnce)
-                        {
-                            var task = _vm.LoadAsync();
-                        }
-                    });
-                }
-            });
-
             await LoadOnAppearedAsync(_mainLayout, false, async () =>
             {
                 try
                 {
                     await _vm.LoadAsync();
                 }
-                catch (Exception e) when (e.Message.Contains("No key."))
+                catch (Exception e) when(e.Message.Contains("No key."))
                 {
                     await Task.Delay(1000);
                     await _vm.LoadAsync();
@@ -89,11 +59,6 @@ namespace Bit.App.Pages
 
         protected override bool OnBackButtonPressed()
         {
-            if (_accountListOverlay.IsVisible)
-            {
-                _accountListOverlay.HideAsync().FireAndForget();
-                return true;
-            }
             if (Device.RuntimePlatform == Device.Android)
             {
                 _appOptions.Uri = null;
@@ -101,13 +66,6 @@ namespace Bit.App.Pages
             return base.OnBackButtonPressed();
         }
 
-        protected override void OnDisappearing()
-        {
-            base.OnDisappearing();
-            IsBusy = false;
-            _accountAvatar?.OnDisappearing();
-        }
-
         private async void RowSelected(object sender, SelectionChangedEventArgs e)
         {
             ((ExtendedCollectionView)sender).SelectedItem = null;

src/App/Pages/Vault/AutofillCiphersPageViewModel.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
-using Bit.App.Controls;
+using Bit.App.Abstractions;
 using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.App.Utilities;
@@ -12,6 +8,9 @@ using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
 
@@ -24,10 +23,8 @@ namespace Bit.App.Pages
         private readonly ICipherService _cipherService;
         private readonly IStateService _stateService;
         private readonly IPasswordRepromptService _passwordRepromptService;
-        private readonly IMessagingService _messagingService;
-        private readonly ILogger _logger;
 
-        private bool _showNoData;
+        private AppOptions _appOptions;
         private bool _showList;
         private string _noDataText;
         private bool _websiteIconsEnabled;
@@ -39,30 +36,15 @@ namespace Bit.App.Pages
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
             _passwordRepromptService = ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService");
-            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
-            _logger = ServiceContainer.Resolve<ILogger>("logger");
 
             GroupedItems = new ObservableRangeCollection<IGroupingsPageListItem>();
             CipherOptionsCommand = new Command<CipherView>(CipherOptionsAsync);
-
-            AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
-            {
-                AllowAddAccountRow = false
-            };
         }
 
         public string Name { get; set; }
         public string Uri { get; set; }
         public Command CipherOptionsCommand { get; set; }
-        public bool LoadedOnce { get; set; }
         public ObservableRangeCollection<IGroupingsPageListItem> GroupedItems { get; set; }
-        public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
-
-        public bool ShowNoData
-        {
-            get => _showNoData;
-            set => SetProperty(ref _showNoData, value);
-        }
 
         public bool ShowList
         {
@@ -83,9 +65,10 @@ namespace Bit.App.Pages
 
         public void Init(AppOptions appOptions)
         {
-            Uri = appOptions?.Uri;
+            _appOptions = appOptions;
+            Uri = appOptions.Uri;
             string name = null;
-            if (Uri?.StartsWith(Constants.AndroidAppProtocol) ?? false)
+            if (Uri.StartsWith(Constants.AndroidAppProtocol))
             {
                 name = Uri.Substring(Constants.AndroidAppProtocol.Length);
             }
@@ -104,10 +87,8 @@ namespace Bit.App.Pages
 
         public async Task LoadAsync()
         {
-            LoadedOnce = true;
-            ShowList = false;
-            ShowNoData = false;
             WebsiteIconsEnabled = !(await _stateService.GetDisableFaviconAsync()).GetValueOrDefault();
+            ShowList = false;
             var groupedItems = new List<GroupingsPageListGroup>();
             var ciphers = await _cipherService.GetAllDecryptedByUrlAsync(Uri, null);
             var matching = ciphers.Item1?.Select(c => new GroupingsPageListItem { Cipher = c }).ToList();
@@ -169,7 +150,6 @@ namespace Bit.App.Pages
                 }
             }
             ShowList = groupedItems.Any();
-            ShowNoData = !ShowList;
         }
 
         public async Task SelectCipherAsync(CipherView cipher, bool fuzzy)

src/App/Pages/Vault/CiphersPage.xaml

@@ -33,9 +33,7 @@
                     Text=""
                     VerticalOptions="CenterAndExpand"
                     Clicked="BackButton_Clicked"
-                    x:Name="_backButton"
-                    AutomationProperties.IsInAccessibleTree="True"
-                    AutomationProperties.Name="{u:I18n TapToGoBack}"/>
+                    x:Name="_backButton" />
                 <controls:ExtendedSearchBar
                     x:Name="_searchBar"
                     HorizontalOptions="FillAndExpand"

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

@@ -1,10 +1,10 @@
-using System;
-using System.Linq;
-using Bit.App.Abstractions;
-using Bit.App.Controls;
+using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
+using System;
+using System.Linq;
+using Bit.App.Controls;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -17,7 +17,8 @@ namespace Bit.App.Pages
         private CiphersPageViewModel _vm;
         private bool _hasFocused;
 
-        public CiphersPage(Func<CipherView, bool> filter, string pageTitle = null, string autofillUrl = null, bool deleted = false)
+        public CiphersPage(Func<CipherView, bool> filter, bool folder = false, bool collection = false,
+            bool type = false, string autofillUrl = null, bool deleted = false)
         {
             InitializeComponent();
             _vm = BindingContext as CiphersPageViewModel;
@@ -25,9 +26,21 @@ namespace Bit.App.Pages
             _vm.Filter = filter;
             _vm.AutofillUrl = _autofillUrl = autofillUrl;
             _vm.Deleted = deleted;
-            if (pageTitle != null)
+            if (deleted)
             {
-                _vm.PageTitle = string.Format(AppResources.SearchGroup, pageTitle);
+                _vm.PageTitle = AppResources.SearchTrash;
+            }
+            else if (folder)
+            {
+                _vm.PageTitle = AppResources.SearchFolder;
+            }
+            else if (collection)
+            {
+                _vm.PageTitle = AppResources.SearchCollection;
+            }
+            else if (type)
+            {
+                _vm.PageTitle = AppResources.SearchType;
             }
             else
             {
@@ -40,7 +53,6 @@ namespace Bit.App.Pages
                 _searchBar.Placeholder = AppResources.Search;
                 _mainLayout.Children.Insert(0, _searchBar);
                 _mainLayout.Children.Insert(1, _separator);
-                ShowModalAnimationDelay = 0;
             }
             else
             {