Version bump to 2.13.0 (#1545)

Co-authored-by: github-actions <>

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,81 @@
+name: Bug Report
+description: File a bug report
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+        
+        Please do not submit feature requests. The [Community Forums](https://community.bitwarden.com) has a section for submitting, voting for, and discussing product feature requests.
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps To Reproduce
+      description: How can we reproduce the behavior.
+      value: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. Click on '...'
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected Result
+      description: A clear and concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: actual
+    attributes:
+      label: Actual Result
+      description: A clear and concise description of what is happening.
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots or Videos
+      description: If applicable, add screenshots and/or a short video to help explain your problem.
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: Add any other context about the problem here.
+  - type: dropdown
+    id: os
+    attributes:
+      label: Operating System
+      description: What operating system are you seeing the problem on?
+      multiple: true
+      options:
+        - Android
+        - iOS
+    validations:
+      required: true
+  - type: input
+    id: os-version
+    attributes:
+      label: Operating System Version
+      description: What version of the operating system(s) are you seeing the problem on?
+  - type: input
+    id: device
+    attributes:
+      label: Device
+      description: Which device are you seeing the problem on?
+      placeholder: iPhone 12, Samsung Galaxy S10
+  - type: input
+    id: version
+    attributes:
+      label: Build Version
+      description: What version of our software are you running? (go to "Settings" → "About" in the app)
+    validations:
+      required: true
+  - type: checkboxes
+    id: beta
+    attributes:
+      label: Beta
+      options:
+        - label: Using a pre-release version of the application.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,17 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Report mobile autofill failure
+    url: https://docs.google.com/forms/d/e/1FAIpQLScMopHyN7KGJs8hW562VTzbIGL4KcFnx0wJcsW0GYE1BnPiGA/viewform
+    about: We are aware of some situations where the Bitwarden mobile app will not autofill information correctly. This is something the Bitwarden team is actively working on but need your help as a community and active Bitwarden users!
+  - name: Feature Requests
+    url: https://community.bitwarden.com/c/feature-requests/
+    about: Request new features using the Community Forums. Please search existing feature requests before making a new one.
+  - name: Bitwarden Community Forums
+    url: https://community.bitwarden.com
+    about: Please visit the community forums for general community discussion, support and the development roadmap.
+  - name: Customer Support
+    url: https://bitwarden.com/contact/
+    about: Please contact our customer support for account issues and general customer support.
+  - name: Security Issues
+    url: https://hackerone.com/bitwarden
+    about: We use HackerOne to manage security disclosures.

.github/resources/export-options-ad-hoc.plist

@@ -7,11 +7,11 @@
     <key>provisioningProfiles</key>
     <dict>
         <key>com.8bit.bitwarden</key>
-        <string>Ad hoc: Bitwarden 2020</string>
+        <string>Ad hoc: Bitwarden 2021</string>
         <key>com.8bit.bitwarden.autofill</key>
-        <string>Ad hoc: Autofill 2020</string>
+        <string>Ad hoc: Autofill 2021</string>
         <key>com.8bit.bitwarden.find-login-action-extension</key>
-        <string>Ad hoc: Extension 2020</string>
+        <string>Ad hoc: Extension 2021</string>
     </dict>
 </dict>
 </plist>

.github/resources/export-options-app-store.plist

@@ -7,11 +7,11 @@
     <key>provisioningProfiles</key>
     <dict>
         <key>com.8bit.bitwarden</key>
-        <string>Dist: Bitwarden 2020</string>
+        <string>Dist: Bitwarden 2021</string>
         <key>com.8bit.bitwarden.autofill</key>
-        <string>Dist: Autofill 2020</string>
+        <string>Dist: Autofill 2021</string>
         <key>com.8bit.bitwarden.find-login-action-extension</key>
-        <string>Dist: Extension 2020</string>
+        <string>Dist: Extension 2021</string>
     </dict>
 </dict>
 </plist>

.github/scripts/android/clean-fdroid.ps1

@@ -30,16 +30,6 @@ $xml.Load($androidManifest);
 $nsAndroid=New-Object System.Xml.XmlNamespaceManager($xml.NameTable);
 $nsAndroid.AddNamespace("android", "http://schemas.android.com/apk/res/android");
 
-$firebaseReceiver1=$xml.SelectSingleNode(`
-    "/manifest/application/receiver[@android:name='com.google.firebase.iid.FirebaseInstanceIdInternalReceiver']", `
-    $nsAndroid);
-$firebaseReceiver1.ParentNode.RemoveChild($firebaseReceiver1);
-
-$firebaseReceiver2=$xml.SelectSingleNode(`
-    "/manifest/application/receiver[@android:name='com.google.firebase.iid.FirebaseInstanceIdReceiver']", `
-    $nsAndroid);
-$firebaseReceiver2.ParentNode.RemoveChild($firebaseReceiver2);
-
 $xml.Save($androidManifest);
 
 Write-Output "########################################"
@@ -56,6 +46,10 @@ $firebaseNode=$xml.SelectSingleNode(`
     "/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.Firebase.Messaging']", $ns);
 $firebaseNode.ParentNode.RemoveChild($firebaseNode);
 
+$daggerNode=$xml.SelectSingleNode(`
+    "/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.Google.Dagger']", $ns);
+$daggerNode.ParentNode.RemoveChild($daggerNode);
+
 $safetyNetNode=$xml.SelectSingleNode(`
     "/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.GooglePlayServices.SafetyNet']", $ns);
 $safetyNetNode.ParentNode.RemoveChild($safetyNetNode);

.github/workflows/build.yml

@@ -1,3 +1,4 @@
+---
 name: Build
 
 on:
@@ -12,11 +13,12 @@ on:
 jobs:
 
   cloc:
+    name: CLOC
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Set up cloc
         run: |
@@ -27,26 +29,26 @@ jobs:
         run: cloc --vcs git --exclude-dir Resources,store,test,Properties --include-lang C#,XAML
 
   android:
+    name: Android
     runs-on: windows-latest
 
     steps:
       - name: Set up MSBuild
-        uses: microsoft/setup-msbuild@v1
+        uses: microsoft/setup-msbuild@c26a08ba26249b81327e26f6ef381897b6a8754d
 
       - name: Print environment
         run: |
-          nuget help
+          nuget help | grep Version
           msbuild -version
           dotnet --info
-          Write-Output "GitHub ref: $env:GITHUB_REF"
-          Write-Output "GitHub event: $env:GITHUB_EVENT"
-        shell: pwsh
+          echo "GitHub ref: $GITHUB_REF"
+          echo "GitHub event: $GITHUB_EVENT"
         env:
           GITHUB_REF: ${{ github.ref }}
           GITHUB_EVENT: ${{ github.event_name }}
 
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Decrypt secrets
         if: github.ref == 'refs/heads/master' || github.event_name == 'release'
@@ -63,6 +65,9 @@ jobs:
       - name: Restore packages
         run: nuget restore
 
+      - name: Run Core Tests
+        run: dotnet test test/Core.Test/Core.Test.csproj
+
       - name: Build Play Store publisher
         run: dotnet build ./store/google/Publisher/Publisher.csproj -p:Configuration=Release
 
@@ -80,14 +85,14 @@ jobs:
 
       - name: Upload Play Store .aab artifact
         if: github.ref == 'refs/heads/master' || github.event_name == 'release'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: com.x8bit.bitwarden.aab
           path: ./com.x8bit.bitwarden.aab
 
       - name: Upload Play Store .apk artifact
         if: github.ref == 'refs/heads/master' || github.event_name == 'release'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: com.x8bit.bitwarden.apk
           path: ./com.x8bit.bitwarden.apk
@@ -112,7 +117,7 @@ jobs:
 
       - name: Upload F-Droid .apk artifact
         if: github.ref == 'refs/heads/master' || github.event_name == 'release'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: com.x8bit.bitwarden-fdroid.apk
           path: ./com.x8bit.bitwarden-fdroid.apk
@@ -135,15 +140,16 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
-  
+
   android-ubuntu:
+    name: Android Ubuntu
     runs-on: ubuntu-latest
     needs: android
 
     steps:
       - name: Set up Node
         if: github.event_name == 'release'
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
         with:
           node-version: '10.x'
 
@@ -178,7 +184,7 @@ jobs:
 
       - name: Checkout repo
         if: github.event_name == 'release'
-        uses: actions/checkout@v2
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Install Node dependencies
         if: github.event_name == 'release'
@@ -207,23 +213,23 @@ jobs:
         run: npm run deploy
 
   ios:
+    name: Apple iOS
     runs-on: macos-latest
 
     steps:
       - name: Print environment
         run: |
-          nuget help
+          nuget help | grep Version
           msbuild -version
           dotnet --info
-          Write-Output "GitHub ref: $env:GITHUB_REF"
-          Write-Output "GitHub event: $env:GITHUB_EVENT"
-        shell: pwsh
+          echo "GitHub ref: $GITHUB_REF"
+          echo "GitHub event: $GITHUB_EVENT"
         env:
           GITHUB_REF: ${{ github.ref }}
           GITHUB_EVENT: ${{ github.event_name }}
 
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Decrypt secrets
         run: ./.github/scripts/ios/decrypt-secrets.ps1
@@ -268,7 +274,7 @@ jobs:
 
       - name: Upload App Store .ipa artifact
         if: github.ref == 'refs/heads/master' || github.event_name == 'release'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: Bitwarden.ipa
           path: ./bitwarden-export/Bitwarden.ipa

.github/workflows/crowdin-sync.yml

@@ -0,0 +1,49 @@
+---
+name: Crowdin Sync
+
+on:
+  workflow_dispatch:
+    inputs: {}
+# schedule:
+#   - cron: '0 0 * * *'
+
+jobs:
+  crowdin-sync:
+    name: Autosync
+    runs-on: ubuntu-20.04
+    env:
+      _CROWDIN_PROJECT_ID: "269690"
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
+
+      - name: Login to Azure
+        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
+        with:
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
+
+      - name: Retrieve secrets
+        id: retrieve-secrets
+        uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403
+        with:
+          keyvault: "bitwarden-prod-kv"
+          secrets: "crowdin-api-token"
+
+      - name: Download translations
+        uses: crowdin/github-action@e39093fd75daae7859c68eded4b43d42ec78d8ea
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
+        with:
+          config: crowdin.yml
+          crowdin_branch_name: master
+          upload_sources: false
+          upload_translations: false
+          download_translations: true
+          github_user_name: "github-actions"
+          github_user_email: "<>"
+          commit_message: "Autosync the updated translations"
+          localization_branch_name: crowdin-auto-sync
+          create_pull_request: true
+          pull_request_title: "Autosync Crowdin Translations"
+          pull_request_body: "Autosync the updated translations"

.github/workflows/release.yml

@@ -0,0 +1,23 @@
+---
+name: Release
+
+on:
+  workflow_dispatch:
+
+jobs:
+
+  cloc:
+    name: CLOC
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
+      - name: Set up cloc
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install cloc
+
+      - name: Print lines of code
+        run: cloc --vcs git --exclude-dir Resources,store,test,Properties --include-lang C#,XAML

ISSUE_TEMPLATE.md

@@ -1,53 +0,0 @@
-<!-- Comment:
-Please do not submit feature requests. The [Community Forums][1] has a
-section for submitting, voting for, and discussing product feature requests.
-[1]: https://community.bitwarden.com
--->
-
-## Describe the Bug
-
-<!-- Comment:
-A clear and concise description of what the bug is.
--->
-
-## Steps To Reproduce
-
-<!-- Comment:
-How can we reproduce the behavior:
--->
-
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. Click on '...'
-
-## Expected Result
-
-<!-- Comment:
-A clear and concise description of what you expected to happen.
--->
-
-## Actual Result
-
-<!-- Comment:
-A clear and concise description of what is happening.
--->
-
-## Screenshots or Videos
-
-<!-- Comment:
-If applicable, add screenshots and/or a short video to help explain your problem.
--->
-
-## Environment
-
-- Device: [e.g. iPhone6]
-- Operating system: [e.g. iOS 8.1]
-- Build Version (go to "Settings" → "About" in the app): [e.g. 2.3.0 (2221)]
-- Is this a Beta release? [Y/N]
-
-## Additional Context
-
-<!-- Comment:
-Add any other context about the problem here.
--->

README.md

@@ -1,4 +1,4 @@
-[![appveyor build](https://ci.appveyor.com/api/projects/status/github/bitwarden/mobile?branch=master&svg=true)](https://ci.appveyor.com/project/bitwarden/mobile)
+[![Github Workflow build on master](https://github.com/bitwarden/mobile/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/bitwarden/mobile/actions/workflows/build.yml?query=branch:master)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/bitwarden-mobile/localized.svg)](https://crowdin.com/project/bitwarden-mobile)
 [![Join the chat at https://gitter.im/bitwarden/Lobby](https://badges.gitter.im/bitwarden/Lobby.svg)](https://gitter.im/bitwarden/Lobby)
 
@@ -8,7 +8,7 @@
 
 The Bitwarden mobile application is written in C# with Xamarin Android, Xamarin iOS, and Xamarin Forms.
 
-<img src="https://raw.githubusercontent.com/bitwarden/brand/master/screenshots/mobile-android-myvault.png" alt="" width="300" height="533" /> <img src="https://raw.githubusercontent.com/bitwarden/brand/master/screenshots/mobile-ios-myvault.png" alt="" width="300" height="533" />
+<img src="https://raw.githubusercontent.com/bitwarden/brand/master/screenshots/mobile-android-myvault.png" alt="" width="325" height="650" /> <img src="https://raw.githubusercontent.com/bitwarden/brand/master/screenshots/mobile-ios-myvault.png" alt="" width="300" height="650" />
 
 # Build/Run
 

appveyor.yml

@@ -1,146 +0,0 @@
-image:
-- Visual Studio 2019
-- Ubuntu1804
-
-branches:
-  except:
-    - l10n_master
-    - gh-pages
-
-configuration: Release
-
-stack: node 10
-
-init:
-- sh: |
-    if [ "${DEBUG_SSH}" == "true" ]
-    then
-      curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -
-    fi
-- ps: |
-    if($isWindows -and $env:DEBUG_RDP -eq "true") {
-      iex ((new-object net.webclient).DownloadString(`
-        'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-    }
-- ps: |
-    if($env:APPVEYOR_REPO_TAG -eq "true") {
-      $tagName = $env:APPVEYOR_REPO_TAG_NAME.TrimStart("v")
-      $env:RELEASE_NAME = "Version ${tagName}"
-    }
-
-install:
-- sh: |
-    curl -sflL 'https://raw.githubusercontent.com/appveyor/secure-file/master/install.sh' | bash -e -
-    ./appveyor-tools/secure-file -decrypt ./store/fdroid/keystore.jks.enc -secret $FDROID_KEYSTORE_ENC_PASSWORD
-- sh: npm install
-- sh: |
-    sudo apt-get -qq update
-    sudo apt-get -qqy install --no-install-recommends fdroidserver wget
-- sh: |
-    if [ "${APPVEYOR_REPO_TAG}" == "true" -a "${GH_TOKEN}" != "" ]
-    then
-      git config --global credential.helper store
-      echo "https://${GH_TOKEN}:x-oauth-basic@github.com" >> ~/.git-credentials
-      git config --global user.email "ci@bitwarden.com"
-      git config --global user.name "Bitwarden CI"
-    fi
-- cmd: choco install cloc --no-progress
-- cmd: "cloc --vcs git --exclude-dir Resources,store,test,Properties --include-lang C#,XAML"
-#- cmd: appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
-#- cmd: appveyor DownloadFile https://aka.ms/vs/15/release/vs_community.exe
-#- cmd: vs_community.exe update --wait --quiet --norestart --installPath "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community"
-#- cmd: ps: .\src\Android\update-android.ps1
-
-before_build:
-- ps: |
-    if($isWindows) {
-      nuget restore
-      if($env:UPLOAD_KEYSTORE_DEC_SECRET -or$env:KEYSTORE_DEC_SECRET -or $env:GOOGLE_SERVICES_DEC_SECRET -or $env:PLAY_DEC_SECRET) {
-        nuget install secure-file -ExcludeVersion
-      }
-      if($env:GOOGLE_SERVICES_DEC_SECRET) {
-        secure-file\tools\secure-file -decrypt src\Android\google-services.json.enc `
-          -secret $env:GOOGLE_SERVICES_DEC_SECRET
-      }
-    }
-
-build_script:
-- sh: |
-    if [ "${APPVEYOR_REPO_TAG}" == "true" ]
-    then
-      mkdir dist
-      cp CNAME ./dist
-      cd store
-      chmod 600 fdroid/config.py fdroid/keystore.jks
-      mkdir -p temp/fdroid
-      TEMP_DIR="$APPVEYOR_BUILD_FOLDER/store/temp/fdroid"
-      cd fdroid
-      echo "keypass=\"$FDROID_KEYSTORE_PASSWORD\"" >>config.py
-      echo "keystorepass=\"$FDROID_KEYSTORE_PASSWORD\"" >>config.py
-      echo "local_copy_dir=\"$TEMP_DIR\"" >>config.py
-      mkdir -p repo
-      curl -Lo repo/com.x8bit.bitwarden-fdroid.apk \
-        https://github.com/bitwarden/mobile/releases/download/$APPVEYOR_REPO_TAG_NAME/com.x8bit.bitwarden-fdroid.apk
-      fdroid update
-      fdroid server update
-      cd ..
-      rm -rf temp/fdroid/archive
-      mv -v temp/fdroid ../dist
-      cd fdroid
-      cp index.html btn.png qr.png ../../dist/fdroid
-      cd $APPVEYOR_BUILD_FOLDER
-    fi
-- ps: |
-    if($isWindows -and $env:KEYSTORE_DEC_SECRET) {
-      msbuild bitwarden-mobile.sln `
-        "/logger:C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" `
-        "/p:Configuration=Release"
-      if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-      .\src\Android\ci-build-apks.ps1
-      if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-      Push-AppveyorArtifact .\com.x8bit.bitwarden.aab
-      Push-AppveyorArtifact .\com.x8bit.bitwarden.apk
-      Push-AppveyorArtifact .\com.x8bit.bitwarden-fdroid.apk
-    }
-
-on_success:
-- sh: |
-    if [ "${APPVEYOR_REPO_TAG}" == "true" -a "${GH_TOKEN}" != "" ]
-    then
-      npm run deploy
-    fi
-- ps: |
-    if($isWindows -and $env:PLAY_DEC_SECRET -and $env:APPVEYOR_REPO_BRANCH -eq 'master') {
-      secure-file\tools\secure-file -decrypt store\google\Publisher\play_creds.json.enc -secret $env:PLAY_DEC_SECRET
-      cd store\google\Publisher\bin\Release\netcoreapp2.0
-      dotnet Publisher.dll `
-        $env:APPVEYOR_BUILD_FOLDER\store\google\Publisher\play_creds.json `
-        $env:APPVEYOR_BUILD_FOLDER\com.x8bit.bitwarden.aab `
-        alpha
-      cd $env:APPVEYOR_BUILD_FOLDER
-    }
-
-on_finish:
-- sh: |
-    if [ "${DEBUG_SSH}" == "true" ]
-    then
-      export APPVEYOR_SSH_BLOCK=true
-      curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -
-    fi
-- ps: |
-    if($isWindows -and $env:DEBUG_RDP -eq "true") {
-      $blockRdp = $true
-      iex ((new-object net.webclient).DownloadString(`
-        'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-    }
-
-deploy:
-  tag: $(APPVEYOR_REPO_TAG_NAME)
-  release: $(RELEASE_NAME)
-  provider: GitHub
-  auth_token: $(GH_TOKEN)
-  artifact: /.*/
-  force_update: true
-  on:
-    branch: master
-    APPVEYOR_REPO_TAG: true

bitwarden-mobile.sln

@@ -23,7 +23,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
-		appveyor.yml = appveyor.yml
 		.github\workflows\build.yml = .github\workflows\build.yml
 		CONTRIBUTING.md = CONTRIBUTING.md
 		crowdin.yml = crowdin.yml
@@ -41,6 +40,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Extension", "src\iOS.Ex
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Autofill", "src\iOS.Autofill\iOS.Autofill.csproj", "{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "test\Common\Common.csproj", "{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Test", "test\Core.Test\Core.Test.csproj", "{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -351,6 +354,66 @@ Global
 		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhone.Build.0 = Release|iPhone
 		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
 		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|Any CPU.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|Any CPU.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|iPhone.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|iPhone.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|iPhoneSimulator.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|iPhone.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|Any CPU.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|Any CPU.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|iPhone.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|iPhone.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|iPhoneSimulator.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhone.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -366,6 +429,8 @@ Global
 		{599E0201-420A-4C3E-A7BA-5349F72E0B15} = {D10CA4A9-F866-40E1-B658-F69051236C71}
 		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545} = {D10CA4A9-F866-40E1-B658-F69051236C71}
 		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A} = {D10CA4A9-F866-40E1-B658-F69051236C71}
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39} = {8904C536-C67D-420F-9971-51B26574C3AA}
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0} = {8904C536-C67D-420F-9971-51B26574C3AA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7D436EA3-8B7E-45D2-8D14-0730BD2E0410}

crowdin.yml

@@ -1,3 +1,5 @@
+project_id_env: _CROWDIN_PROJECT_ID
+api_token_env: CROWDIN_API_TOKEN
 files:
   - source: /src/App/Resources/AppResources.resx
     translation: /src/App/Resources/AppResources.%two_letters_code%.resx

src/Android/Accessibility/AccessibilityHelpers.cs

@@ -31,9 +31,11 @@ namespace Bit.Droid.Accessibility
             // So keep them in sync with:
             //   - AutofillHelpers.{TrustedBrowsers,CompatBrowsers}
             //   - Resources/xml/autofillservice.xml
+            new Browser("alook.browser", "search_fragment_input_view"),
             new Browser("com.amazon.cloud9", "url"),
             new Browser("com.android.browser", "url"),
             new Browser("com.android.chrome", "url_bar"),
+            // Rem. for "com.android.htmlviewer": doesn't have a URL bar, therefore not present here.
             new Browser("com.avast.android.secure.browser", "editor"),
             new Browser("com.avg.android.secure.browser", "editor"),
             new Browser("com.brave.browser", "url_bar"),
@@ -44,14 +46,21 @@ namespace Bit.Droid.Accessibility
             new Browser("com.chrome.beta", "url_bar"),
             new Browser("com.chrome.canary", "url_bar"),
             new Browser("com.chrome.dev", "url_bar"),
+            new Browser("com.cookiegames.smartcookie", "search"),
+            new Browser("com.cookiejarapps.android.smartcookieweb", "mozac_browser_toolbar_url_view"),
             new Browser("com.duckduckgo.mobile.android", "omnibarTextInput"),
             new Browser("com.ecosia.android", "url_bar"),
             new Browser("com.google.android.apps.chrome", "url_bar"),
             new Browser("com.google.android.apps.chrome_dev", "url_bar"),
+            new Browser("com.jamal2367.styx", "search"),
             new Browser("com.kiwibrowser.browser", "url_bar"),
             new Browser("com.microsoft.emmx", "url_bar"),
+            new Browser("com.microsoft.emmx.beta", "url_bar"),
+            new Browser("com.microsoft.emmx.canary", "url_bar"),
+            new Browser("com.microsoft.emmx.dev", "url_bar"),
             new Browser("com.mmbox.browser", "search_box"),
             new Browser("com.mmbox.xbrowser", "search_box"),
+            new Browser("com.mycompany.app.soulbrowser", "edit_text"),
             new Browser("com.naver.whale", "url_bar"),
             new Browser("com.opera.browser", "url_field"),
             new Browser("com.opera.browser.beta", "url_field"),
@@ -68,13 +77,17 @@ namespace Bit.Droid.Accessibility
             new Browser("com.vivaldi.browser.sopranos", "url_bar"),
             new Browser("com.yandex.browser", "bro_omnibar_address_title_text,bro_omnibox_collapsed_title",
                 (s) => s.Split(new char[]{' ', ' '}).FirstOrDefault()), // 0 = Regular Space, 1 = No-break space (00A0)
-            new Browser("com.z28j.feel", "g2"), // "g2" for version 0.9.8.4 (984)
+            new Browser("com.z28j.feel", "g2"),
             new Browser("idm.internet.download.manager", "search"),
             new Browser("idm.internet.download.manager.adm.lite", "search"),
             new Browser("idm.internet.download.manager.plus", "search"),
             new Browser("io.github.forkmaintainers.iceraven", "mozac_browser_toolbar_url_view"),
-            new Browser("mark.via", "o"), // "o" for version 4.0.7 (20200929)
-            new Browser("mark.via.gp", "o"), // "o" for version 4.0.7 (20200929)
+            new Browser("mark.via", "am,an"),
+            new Browser("mark.via.gp", "as"),
+            new Browser("net.slions.fulguris.full.download", "search"),
+            new Browser("net.slions.fulguris.full.download.debug", "search"),
+            new Browser("net.slions.fulguris.full.playstore", "search"),
+            new Browser("net.slions.fulguris.full.playstore.debug", "search"),
             new Browser("org.adblockplus.browser", "url_bar,url_bar_title"), // 2nd = Legacy (before v2)
             new Browser("org.adblockplus.browser.beta", "url_bar,url_bar_title"), // 2nd = Legacy (before v2)
             new Browser("org.bromite.bromite", "url_bar"),
@@ -83,8 +96,8 @@ namespace Bit.Droid.Accessibility
             new Browser("org.codeaurora.swe.browser", "url_bar"),
             new Browser("org.gnu.icecat", "url_bar_title,mozac_browser_toolbar_url_view"), // 2nd = Anticipation
             new Browser("org.mozilla.fenix", "mozac_browser_toolbar_url_view"),
-            new Browser("org.mozilla.fenix.nightly", "mozac_browser_toolbar_url_view"), // [DEPRECATED]
-            new Browser("org.mozilla.fennec_aurora", "mozac_browser_toolbar_url_view,url_bar_title"), // [DEPRECATED]
+            new Browser("org.mozilla.fenix.nightly", "mozac_browser_toolbar_url_view"), // [DEPRECATED ENTRY]
+            new Browser("org.mozilla.fennec_aurora", "mozac_browser_toolbar_url_view,url_bar_title"), // [DEPRECATED ENTRY]
             new Browser("org.mozilla.fennec_fdroid", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy
             new Browser("org.mozilla.firefox", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy
             new Browser("org.mozilla.firefox_beta", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy
@@ -92,11 +105,11 @@ namespace Bit.Droid.Accessibility
             new Browser("org.mozilla.klar", "display_url"),
             new Browser("org.mozilla.reference.browser", "mozac_browser_toolbar_url_view"),
             new Browser("org.mozilla.rocket", "display_url"),
-            new Browser("org.torproject.torbrowser", "url_bar_title,mozac_browser_toolbar_url_view"), // 2nd = Anticipation
+            new Browser("org.torproject.torbrowser", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy (before v10.0.3)
             new Browser("org.torproject.torbrowser_alpha", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy (before v10.0a8)
-            new Browser("org.ungoogled.chromium", "url_bar"), // [DEPRECATED]
             new Browser("org.ungoogled.chromium.extensions.stable", "url_bar"),
             new Browser("org.ungoogled.chromium.stable", "url_bar"),
+            new Browser("us.spotco.fennec_dos", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy
 
             // [Section B] Entries only present here
             //
@@ -181,7 +194,9 @@ namespace Bit.Droid.Accessibility
             new KnownUsernameField("amazon.in",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
             new KnownUsernameField("amazon.it",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
             new KnownUsernameField("amazon.nl",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.pl",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
             new KnownUsernameField("amazon.sa",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.se",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
             new KnownUsernameField("amazon.sg",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
 
             // Amazon Web Services
@@ -390,12 +405,12 @@ namespace Bit.Droid.Accessibility
                 var hasHttpProtocol = uri.StartsWith("http://") || uri.StartsWith("https://");
                 if (!hasHttpProtocol && uri.Contains("."))
                 {
-                    if (Uri.TryCreate("http://" + uri, UriKind.Absolute, out var uri2))
+                    if (Uri.TryCreate("https://" + uri, UriKind.Absolute, out var _))
                     {
-                        return string.Concat("http://", uri);
+                        return string.Concat("https://", uri);
                     }
                 }
-                if (Uri.TryCreate(uri, UriKind.Absolute, out var uri3))
+                if (Uri.TryCreate(uri, UriKind.Absolute, out var _))
                 {
                     return uri;
                 }

src/Android/Android.csproj

@@ -28,11 +28,8 @@
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>3</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
     <AndroidSupportedAbis />
     <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
-    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>
@@ -77,23 +74,26 @@
       <Version>2.1.0.4</Version>
     </PackageReference>
     <PackageReference Include="Portable.BouncyCastle">
-      <Version>1.8.6.7</Version>
+      <Version>1.8.10</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.3-beta01" />
+    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.5.0" />
+    <PackageReference Include="Xamarin.AndroidX.AppCompat.AppCompatResources" Version="1.3.0" />
+    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.3.0" />
+    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.6" />
+    <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.8" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
+    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.2.4" />
+    <PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.8" />
     <PackageReference Include="Xamarin.Essentials">
-      <Version>1.5.3.2</Version>
+      <Version>1.7.0</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Firebase.Messaging">
-      <Version>71.1740.0</Version>
+      <Version>122.0.0</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
-    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.1.0" />
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
-    <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0" />
-    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.1.0" />
-    <PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.6" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.3.0.1" />
+    <PackageReference Include="Xamarin.Google.Dagger" Version="2.37.0" />
     <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet">
-      <Version>71.1600.0</Version>
+      <Version>117.0.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -115,21 +115,21 @@
     <Compile Include="Effects\FixedSizeEffect.cs" />
     <Compile Include="Effects\SelectableLabelEffect.cs" />
     <Compile Include="Effects\TabBarEffect.cs" />
-    <Compile Include="Push\FirebaseInstanceIdService.cs" />
     <Compile Include="Push\FirebaseMessagingService.cs" />
     <Compile Include="Receivers\ClearClipboardAlarmReceiver.cs" />
     <Compile Include="Receivers\RestrictionsChangedReceiver.cs" />
     <Compile Include="Receivers\EventUploadReceiver.cs" />
-    <Compile Include="Receivers\LockAlarmReceiver.cs" />
     <Compile Include="Receivers\PackageReplacedReceiver.cs" />
-    <Compile Include="Renderers\CipherViewCellRenderer.cs" />
+    <Compile Include="Renderers\ExtendedGridRenderer.cs" />
+    <Compile Include="Renderers\ExtendedDatePickerRenderer.cs" />
     <Compile Include="Renderers\CustomTabbedRenderer.cs" />
+    <Compile Include="Renderers\ExtendedStackLayoutRenderer.cs" />
+    <Compile Include="Renderers\ExtendedTimePickerRenderer.cs" />
     <Compile Include="Renderers\ExtendedSliderRenderer.cs" />
     <Compile Include="Renderers\CustomEditorRenderer.cs" />
     <Compile Include="Renderers\CustomPickerRenderer.cs" />
     <Compile Include="Renderers\CustomEntryRenderer.cs" />
     <Compile Include="Renderers\CustomSearchBarRenderer.cs" />
-    <Compile Include="Renderers\ExtendedListViewRenderer.cs" />
     <Compile Include="Renderers\HybridWebViewRenderer.cs" />
     <Compile Include="Services\AndroidPushNotificationService.cs" />
     <Compile Include="Services\AndroidLogService.cs" />
@@ -153,7 +153,6 @@
     <AndroidAsset Include="Assets\RobotoMono_Regular.ttf" />
     <AndroidAsset Include="Assets\MaterialIcons_Regular.ttf" />
     <None Include="8bit.keystore.enc" />
-    <None Include="ci-build-apks.ps1" />
     <GoogleServicesJson Include="google-services.json" />
     <GoogleServicesJson Include="google-services.json.enc" />
     <None Include="fdroid-keystore.jks.enc" />
@@ -172,10 +171,15 @@
     <AndroidResource Include="Resources\drawable\icon.xml" />
     <AndroidResource Include="Resources\drawable\ic_launcher_foreground.xml" />
     <AndroidResource Include="Resources\drawable\id.xml" />
+    <AndroidResource Include="Resources\drawable\info.xml" />
+    <AndroidResource Include="Resources\drawable\list_item_bg.xml" />
+    <AndroidResource Include="Resources\drawable\list_item_bg_dark.xml" />
+    <AndroidResource Include="Resources\drawable\list_item_bg_nord.xml" />
     <AndroidResource Include="Resources\drawable\lock.xml" />
     <AndroidResource Include="Resources\drawable\login.xml" />
     <AndroidResource Include="Resources\drawable\logo.xml" />
     <AndroidResource Include="Resources\drawable\logo_white.xml" />
+    <AndroidResource Include="Resources\drawable\paper_plane.xml" />
     <AndroidResource Include="Resources\drawable\pencil.xml" />
     <AndroidResource Include="Resources\drawable\plus.xml" />
     <AndroidResource Include="Resources\drawable\refresh.xml" />
@@ -206,7 +210,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\App\App.csproj">
-      <Project>{9F1742A7-7D03-4BB3-8FCD-41BC3002B00A}</Project>
+      <Project>{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}</Project>
       <Name>App</Name>
     </ProjectReference>
     <ProjectReference Include="..\Core\Core.csproj">
@@ -259,12 +263,6 @@
       <SubType>Designer</SubType>
     </AndroidResource>
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\layout\CipherViewCell.axml">
-      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
-      <SubType>Designer</SubType>
-    </AndroidResource>
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\xml\app_restrictions.xml">
       <Generator>MSBuild:UpdateGeneratedFiles</Generator>

src/Android/Autofill/AutofillHelpers.cs

@@ -48,6 +48,7 @@ namespace Bit.Droid.Autofill
         //   - ... to keep this list in sync with values in AccessibilityHelpers.SupportedBrowsers [Section A], too.
         public static HashSet<string> CompatBrowsers = new HashSet<string>
         {
+            "alook.browser",
             "com.amazon.cloud9",
             "com.android.browser",
             "com.android.chrome",
@@ -62,13 +63,20 @@ namespace Bit.Droid.Autofill
             "com.chrome.beta",
             "com.chrome.canary",
             "com.chrome.dev",
+            "com.cookiegames.smartcookie",
+            "com.cookiejarapps.android.smartcookieweb",
             "com.ecosia.android",
             "com.google.android.apps.chrome",
             "com.google.android.apps.chrome_dev",
+            "com.jamal2367.styx",
             "com.kiwibrowser.browser",
             "com.microsoft.emmx",
+            "com.microsoft.emmx.beta",
+            "com.microsoft.emmx.canary",
+            "com.microsoft.emmx.dev",
             "com.mmbox.browser",
             "com.mmbox.xbrowser",
+            "com.mycompany.app.soulbrowser",
             "com.naver.whale",
             "com.opera.browser",
             "com.opera.browser.beta",
@@ -91,6 +99,10 @@ namespace Bit.Droid.Autofill
             "io.github.forkmaintainers.iceraven",
             "mark.via",
             "mark.via.gp",
+            "net.slions.fulguris.full.download",
+            "net.slions.fulguris.full.download.debug",            
+            "net.slions.fulguris.full.playstore",
+            "net.slions.fulguris.full.playstore.debug",
             "org.adblockplus.browser",
             "org.adblockplus.browser.beta",
             "org.bromite.bromite",
@@ -108,9 +120,9 @@ namespace Bit.Droid.Autofill
             "org.mozilla.rocket",
             "org.torproject.torbrowser",
             "org.torproject.torbrowser_alpha",
-            "org.ungoogled.chromium",
             "org.ungoogled.chromium.extensions.stable",
             "org.ungoogled.chromium.stable",
+            "us.spotco.fennec_dos",
         };
 
         // The URLs are blacklisted from autofilling
@@ -131,13 +143,14 @@ namespace Bit.Droid.Autofill
                 {
                     var allCiphers = ciphers.Item1.ToList();
                     allCiphers.AddRange(ciphers.Item2.ToList());
-                    return allCiphers.Select(c => new FilledItem(c)).ToList();
+                    var nonPromptCiphers = allCiphers.Where(cipher => cipher.Reprompt == CipherRepromptType.None);
+                    return nonPromptCiphers.Select(c => new FilledItem(c)).ToList();
                 }
             }
             else if (parser.FieldCollection.FillableForCard)
             {
                 var ciphers = await cipherService.GetAllDecryptedAsync();
-                return ciphers.Where(c => c.Type == CipherType.Card).Select(c => new FilledItem(c)).ToList();
+                return ciphers.Where(c => c.Type == CipherType.Card && c.Reprompt == CipherRepromptType.None).Select(c => new FilledItem(c)).ToList();
             }
             return new List<FilledItem>();
         }

src/Android/Autofill/AutofillService.cs

@@ -23,6 +23,8 @@ namespace Bit.Droid.Autofill
         private ICipherService _cipherService;
         private IVaultTimeoutService _vaultTimeoutService;
         private IStorageService _storageService;
+        private IPolicyService _policyService;
+        private IUserService _userService;
 
         public async override void OnFillRequest(FillRequest request, CancellationSignal cancellationSignal,
             FillCallback callback)
@@ -55,6 +57,7 @@ namespace Bit.Droid.Autofill
             }
 
             List<FilledItem> items = null;
+            await _vaultTimeoutService.CheckVaultTimeoutAsync();
             var locked = await _vaultTimeoutService.IsLockedAsync();
             if (!locked)
             {
@@ -89,6 +92,26 @@ namespace Bit.Droid.Autofill
                 return;
             }
 
+            _policyService ??= ServiceContainer.Resolve<IPolicyService>("policyService");
+
+            var personalOwnershipPolicies = await _policyService.GetAll(PolicyType.PersonalOwnership);
+            if (personalOwnershipPolicies != null)
+            {
+                _userService ??= ServiceContainer.Resolve<IUserService>("userService");
+                foreach (var policy in personalOwnershipPolicies)
+                {
+                    if (policy.Enabled)
+                    {
+                        var org = await _userService.GetOrganizationAsync(policy.OrganizationId);
+                        if (org != null && org.Enabled && org.UsePolicies && !org.canManagePolicies
+                           && org.Status == OrganizationUserStatusType.Confirmed)
+                        {
+                            return;
+                        }
+                    }
+                }
+            }
+            
             var parser = new Parser(structure, ApplicationContext);
             parser.Parse();
 

src/Android/MainActivity.cs

@@ -27,7 +27,20 @@ namespace Bit.Droid
         Icon = "@mipmap/ic_launcher",
         Theme = "@style/LaunchTheme",
         MainLauncher = true,
-        ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
+        LaunchMode = LaunchMode.SingleTask,
+        ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation |
+                               ConfigChanges.Keyboard | ConfigChanges.KeyboardHidden |
+                               ConfigChanges.Navigation)]
+    [IntentFilter(
+        new[] { Intent.ActionSend },
+        Categories = new[] { Intent.CategoryDefault },
+        DataMimeTypes = new[]
+        {
+            @"application/*",
+            @"image/*",
+            @"video/*",
+            @"text/*"
+        })]
     [Register("com.x8bit.bitwarden.MainActivity")]
     public class MainActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity
     {
@@ -38,7 +51,6 @@ namespace Bit.Droid
         private IAppIdService _appIdService;
         private IStorageService _storageService;
         private IEventService _eventService;
-        private PendingIntent _vaultTimeoutAlarmPendingIntent;
         private PendingIntent _clearClipboardPendingIntent;
         private PendingIntent _eventUploadPendingIntent;
         private AppOptions _appOptions;
@@ -51,9 +63,6 @@ namespace Bit.Droid
             var eventUploadIntent = new Intent(this, typeof(EventUploadReceiver));
             _eventUploadPendingIntent = PendingIntent.GetBroadcast(this, 0, eventUploadIntent,
                 PendingIntentFlags.UpdateCurrent);
-            var alarmIntent = new Intent(this, typeof(LockAlarmReceiver));
-            _vaultTimeoutAlarmPendingIntent = PendingIntent.GetBroadcast(this, 0, alarmIntent,
-                PendingIntentFlags.UpdateCurrent);
             var clearClipboardIntent = new Intent(this, typeof(ClearClipboardAlarmReceiver));
             _clearClipboardPendingIntent = PendingIntent.GetBroadcast(this, 0, clearClipboardIntent,
                 PendingIntentFlags.UpdateCurrent);
@@ -91,20 +100,7 @@ namespace Bit.Droid
 
             _broadcasterService.Subscribe(_activityKey, (message) =>
             {
-                if (message.Command == "scheduleVaultTimeoutTimer")
-                {
-                    var alarmManager = GetSystemService(AlarmService) as AlarmManager;
-                    var vaultTimeoutMinutes = (int)message.Data;
-                    var vaultTimeoutMs = vaultTimeoutMinutes * 60000;
-                    var triggerMs = Java.Lang.JavaSystem.CurrentTimeMillis() + vaultTimeoutMs + 10;
-                    alarmManager.Set(AlarmType.RtcWakeup, triggerMs, _vaultTimeoutAlarmPendingIntent);
-                }
-                else if (message.Command == "cancelVaultTimeoutTimer")
-                {
-                    var alarmManager = GetSystemService(AlarmService) as AlarmManager;
-                    alarmManager.Cancel(_vaultTimeoutAlarmPendingIntent);
-                }
-                else if (message.Command == "startEventTimer")
+                if (message.Command == "startEventTimer")
                 {
                     StartEventAlarm();
                 }
@@ -153,31 +149,48 @@ namespace Bit.Droid
                 }
                 catch { }
             }
-            var setRestrictions = AndroidHelpers.SetPreconfiguredRestrictionSettingsAsync(this);
+            AndroidHelpers.SetPreconfiguredRestrictionSettingsAsync(this)
+                .GetAwaiter()
+                .GetResult();
         }
 
         protected override void OnNewIntent(Intent intent)
         {
             base.OnNewIntent(intent);
-            if (intent.GetBooleanExtra("generatorTile", false))
+            try
             {
-                _messagingService.Send("popAllAndGoToTabGenerator");
-                if (_appOptions != null)
+                if (intent.GetBooleanExtra("generatorTile", false))
                 {
-                    _appOptions.GeneratorTile = true;
+                    _messagingService.Send("popAllAndGoToTabGenerator");
+                    if (_appOptions != null)
+                    {
+                        _appOptions.GeneratorTile = true;
+                    }
+                }
+                else if (intent.GetBooleanExtra("myVaultTile", false))
+                {
+                    _messagingService.Send("popAllAndGoToTabMyVault");
+                    if (_appOptions != null)
+                    {
+                        _appOptions.MyVaultTile = true;
+                    }
+                }
+                else if (intent.Action == Intent.ActionSend && intent.Type != null)
+                {
+                    if (_appOptions != null)
+                    {
+                        _appOptions.CreateSend = GetCreateSendRequest(intent);
+                    }
+                    _messagingService.Send("popAllAndGoToTabSend");
+                }
+                else
+                {
+                    ParseYubiKey(intent.DataString);
                 }
             }
-            if (intent.GetBooleanExtra("myVaultTile", false))
+            catch (Exception e)
             {
-                _messagingService.Send("popAllAndGoToTabMyVault");
-                if (_appOptions != null)
-                {
-                    _appOptions.MyVaultTile = true;
-                }
-            }
-            else
-            {
-                ParseYubiKey(intent.DataString);
+                System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", e.GetType(), e.StackTrace);
             }
         }
 
@@ -296,7 +309,8 @@ namespace Bit.Droid
                 Uri = Intent.GetStringExtra("uri") ?? Intent.GetStringExtra("autofillFrameworkUri"),
                 MyVaultTile = Intent.GetBooleanExtra("myVaultTile", false),
                 GeneratorTile = Intent.GetBooleanExtra("generatorTile", false),
-                FromAutofillFramework = Intent.GetBooleanExtra("autofillFramework", false)
+                FromAutofillFramework = Intent.GetBooleanExtra("autofillFramework", false),
+                CreateSend = GetCreateSendRequest(Intent)
             };
             var fillType = Intent.GetIntExtra("autofillFrameworkFillType", 0);
             if (fillType > 0)
@@ -318,6 +332,42 @@ namespace Bit.Droid
             return options;
         }
 
+        private Tuple<SendType, string, byte[], string> GetCreateSendRequest(Intent intent)
+        {
+            if (intent.Action == Intent.ActionSend && intent.Type != null)
+            {
+                if ((intent.Flags & ActivityFlags.LaunchedFromHistory) == ActivityFlags.LaunchedFromHistory)
+                {
+                    // don't re-deliver intent if resuming from app switcher
+                    return null;
+                }
+                var type = intent.Type;
+                if (type.Contains("text/"))
+                {
+                    var subject = intent.GetStringExtra(Intent.ExtraSubject);
+                    var text = intent.GetStringExtra(Intent.ExtraText);
+                    return new Tuple<SendType, string, byte[], string>(SendType.Text, subject, null, text);
+                }
+                else
+                {
+                    var data = intent.ClipData?.GetItemAt(0);
+                    var uri = data?.Uri;
+                    var filename = AndroidHelpers.GetFileName(ApplicationContext, uri);
+                    try
+                    {
+                        using (var stream = ContentResolver.OpenInputStream(uri))
+                        using (var memoryStream = new MemoryStream())
+                        {
+                            stream.CopyTo(memoryStream);
+                            return new Tuple<SendType, string, byte[], string>(SendType.File, filename, memoryStream.ToArray(), null);
+                        }
+                    }
+                    catch (Java.IO.FileNotFoundException) { }
+                }
+            }
+            return null;
+        }
+
         private void ParseYubiKey(string data)
         {
             if (data == null)

src/Android/MainApplication.cs

@@ -87,7 +87,6 @@ namespace Bit.Droid
             var preferencesStorage = new PreferencesStorageService(null);
             var documentsPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal);
             var liteDbStorage = new LiteDbStorageService(Path.Combine(documentsPath, "bitwarden.db"));
-            liteDbStorage.InitAsync();
             var localizeService = new LocalizeService();
             var broadcasterService = new BroadcasterService();
             var messagingService = new MobileBroadcasterMessagingService(broadcasterService);
@@ -100,6 +99,9 @@ namespace Bit.Droid
             var platformUtilsService = new MobilePlatformUtilsService(deviceActionService, messagingService,
                 broadcasterService);
             var biometricService = new BiometricService();
+            var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
+            var cryptoService = new CryptoService(mobileStorageService, secureStorageService, cryptoFunctionService);
+            var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService);
 
             ServiceContainer.Register<IBroadcasterService>("broadcasterService", broadcasterService);
             ServiceContainer.Register<IMessagingService>("messagingService", messagingService);
@@ -111,6 +113,9 @@ namespace Bit.Droid
             ServiceContainer.Register<IDeviceActionService>("deviceActionService", deviceActionService);
             ServiceContainer.Register<IPlatformUtilsService>("platformUtilsService", platformUtilsService);
             ServiceContainer.Register<IBiometricService>("biometricService", biometricService);
+            ServiceContainer.Register<ICryptoFunctionService>("cryptoFunctionService", cryptoFunctionService);
+            ServiceContainer.Register<ICryptoService>("cryptoService", cryptoService);
+            ServiceContainer.Register<IPasswordRepromptService>("passwordRepromptService", passwordRepromptService);
 
             // Push
 #if FDROID

src/Android/Properties/AndroidManifest.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:versionCode="1"
-  android:versionName="2.7.0"
+  android:versionName="2.13.0"
   android:installLocation="internalOnly"
   package="com.x8bit.bitwarden">
 
@@ -40,20 +40,6 @@
         android:resource="@xml/filepaths" />
     </provider>
 
-    <receiver
-      android:name="com.google.firebase.iid.FirebaseInstanceIdInternalReceiver"
-      android:exported="false" />
-    <receiver
-      android:name="com.google.firebase.iid.FirebaseInstanceIdReceiver"
-      android:exported="true"
-      android:permission="com.google.android.c2dm.permission.SEND">
-      <intent-filter>
-        <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-        <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
-        <category android:name="com.x8bit.bitwarden" />
-      </intent-filter>
-    </receiver>
-
     <meta-data android:name="android.max_aspect" android:value="2.1" />
     <meta-data android:name="android.content.APP_RESTRICTIONS" android:resource="@xml/app_restrictions" />
 
@@ -64,4 +50,12 @@
     <!-- Support for LG "Dual Window" mode (for Android < 7.0 users) -->
     <meta-data android:name="com.lge.support.SPLIT_WINDOW" android:value="true" />
   </application>
+
+  <!-- Package visibility (for Android 11+) -->
+  <queries>
+      <intent>
+          <action android:name="*"/>
+      </intent>
+  </queries>
+
 </manifest>

src/Android/Push/FirebaseInstanceIdService.cs

@@ -1,25 +0,0 @@
-#if !FDROID
-using Android.App;
-using Android.Content;
-using Bit.App.Abstractions;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Firebase.Iid;
-
-namespace Bit.Droid.Push
-{
-    [Service]
-    [IntentFilter(new[] { "com.google.firebase.INSTANCE_ID_EVENT" })]
-    public class FirebaseInstanceIdService : Firebase.Iid.FirebaseInstanceIdService
-    {
-        public async override void OnTokenRefresh()
-        {
-            var storageService = ServiceContainer.Resolve<IStorageService>("storageService");
-            var pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>("pushNotificationService");
-            await storageService.SaveAsync(Constants.PushRegisteredTokenKey, FirebaseInstanceId.Instance.Token);
-            await pushNotificationService.RegisterAsync();
-        }
-    }
-}
-#endif

src/Android/Push/FirebaseMessagingService.cs

@@ -1,7 +1,7 @@
 #if !FDROID
 using Android.App;
-using Android.Content;
 using Bit.App.Abstractions;
+using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using Firebase.Messaging;
 using Newtonsoft.Json;
@@ -10,10 +10,19 @@ using Xamarin.Forms;
 
 namespace Bit.Droid.Push
 {
-    [Service]
+    [Service(Exported=false)]
     [IntentFilter(new[] { "com.google.firebase.MESSAGING_EVENT" })]
     public class FirebaseMessagingService : Firebase.Messaging.FirebaseMessagingService
     {
+        public async override void OnNewToken(string token)
+        {
+            var storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            var pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>("pushNotificationService");
+            
+            await storageService.SaveAsync(Core.Constants.PushRegisteredTokenKey, token);
+            await pushNotificationService.RegisterAsync();
+        }
+        
         public async override void OnMessageReceived(RemoteMessage message)
         {
             if (message?.Data == null)

src/Android/Receivers/ClearClipboardAlarmReceiver.cs

@@ -8,7 +8,7 @@ namespace Bit.Droid.Receivers
         public override void OnReceive(Context context, Intent intent)
         {
             var clipboardManager = context.GetSystemService(Context.ClipboardService) as ClipboardManager;
-            clipboardManager.PrimaryClip = ClipData.NewPlainText("bitwarden", string.Empty);
+            clipboardManager.PrimaryClip = ClipData.NewPlainText("bitwarden", " ");
         }
     }
 }

src/Android/Receivers/LockAlarmReceiver.cs

@@ -1,16 +0,0 @@
-using Android.Content;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-
-namespace Bit.Droid.Receivers
-{
-    [BroadcastReceiver(Name = "com.x8bit.bitwarden.LockAlarmReceiver", Exported = false)]
-    public class LockAlarmReceiver : BroadcastReceiver
-    {
-        public async override void OnReceive(Context context, Intent intent)
-        {
-            var vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
-            await vaultTimeoutService.CheckVaultTimeoutAsync();
-        }
-    }
-}

src/Android/Renderers/CipherViewCellRenderer.cs

@@ -1,242 +0,0 @@
-using Android.App;
-using Android.Content;
-using Android.Graphics;
-using Android.Runtime;
-using Android.Util;
-using Android.Views;
-using Android.Views.InputMethods;
-using Android.Widget;
-using Bit.App.Controls;
-using Bit.App.Utilities;
-using Bit.Droid.Renderers;
-using FFImageLoading;
-using FFImageLoading.Views;
-using FFImageLoading.Work;
-using System;
-using System.ComponentModel;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(CipherViewCell), typeof(CipherViewCellRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class CipherViewCellRenderer : ViewCellRenderer
-    {
-        private static Typeface _faTypeface;
-        private static Typeface _miTypeface;
-        private static Android.Graphics.Color _textColor;
-        private static Android.Graphics.Color _mutedColor;
-        private static Android.Graphics.Color _disabledIconColor;
-        private static bool _usingLightTheme;
-
-        private AndroidCipherCell _cell;
-
-        protected override Android.Views.View GetCellCore(Cell item, Android.Views.View convertView,
-            ViewGroup parent, Context context)
-        {
-            // TODO expand beyond light/dark detection once we support custom theme switching without app restart
-            var themeChanged = _usingLightTheme != ThemeManager.UsingLightTheme;
-            if (_faTypeface == null)
-            {
-                _faTypeface = Typeface.CreateFromAsset(context.Assets, "FontAwesome.ttf");
-            }
-            if (_miTypeface == null)
-            {
-                _miTypeface = Typeface.CreateFromAsset(context.Assets, "MaterialIcons_Regular.ttf");
-            }
-            if (_textColor == default(Android.Graphics.Color) || themeChanged)
-            {
-                _textColor = ThemeManager.GetResourceColor("TextColor").ToAndroid();
-            }
-            if (_mutedColor == default(Android.Graphics.Color) || themeChanged)
-            {
-                _mutedColor = ThemeManager.GetResourceColor("MutedColor").ToAndroid();
-            }
-            if (_disabledIconColor == default(Android.Graphics.Color) || themeChanged)
-            {
-                _disabledIconColor = ThemeManager.GetResourceColor("DisabledIconColor").ToAndroid();
-            }
-            _usingLightTheme = ThemeManager.UsingLightTheme;
-
-            var cipherCell = item as CipherViewCell;
-            _cell = convertView as AndroidCipherCell;
-            if (_cell == null)
-            {
-                _cell = new AndroidCipherCell(context, cipherCell, _faTypeface, _miTypeface);
-            }
-            else
-            {
-                _cell.CipherViewCell.PropertyChanged -= CellPropertyChanged;
-            }
-            cipherCell.PropertyChanged += CellPropertyChanged;
-            _cell.UpdateCell(cipherCell);
-            _cell.UpdateColors(_textColor, _mutedColor, _disabledIconColor);
-            return _cell;
-        }
-
-        public void CellPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            var cipherCell = sender as CipherViewCell;
-            _cell.CipherViewCell = cipherCell;
-            if (e.PropertyName == CipherViewCell.CipherProperty.PropertyName)
-            {
-                _cell.UpdateCell(cipherCell);
-            }
-            else if (e.PropertyName == CipherViewCell.WebsiteIconsEnabledProperty.PropertyName)
-            {
-                _cell.UpdateIconImage(cipherCell);
-            }
-        }
-    }
-
-    public class AndroidCipherCell : LinearLayout, INativeElementView
-    {
-        private readonly Typeface _faTypeface;
-        private readonly Typeface _miTypeface;
-
-        private IScheduledWork _currentTask;
-
-        public AndroidCipherCell(Context context, CipherViewCell cipherView, Typeface faTypeface, Typeface miTypeface)
-            : base(context)
-        {
-            CipherViewCell = cipherView;
-            _faTypeface = faTypeface;
-            _miTypeface = miTypeface;
-
-            var view = (context as Activity).LayoutInflater.Inflate(Resource.Layout.CipherViewCell, null);
-            IconImage = view.FindViewById<IconImageView>(Resource.Id.CipherCellIconImage);
-            Icon = view.FindViewById<TextView>(Resource.Id.CipherCellIcon);
-            Name = view.FindViewById<TextView>(Resource.Id.CipherCellName);
-            SubTitle = view.FindViewById<TextView>(Resource.Id.CipherCellSubTitle);
-            SharedIcon = view.FindViewById<TextView>(Resource.Id.CipherCellSharedIcon);
-            AttachmentsIcon = view.FindViewById<TextView>(Resource.Id.CipherCellAttachmentsIcon);
-            MoreButton = view.FindViewById<Android.Widget.Button>(Resource.Id.CipherCellButton);
-            MoreButton.Click += MoreButton_Click;
-
-            Icon.Typeface = _faTypeface;
-            SharedIcon.Typeface = _faTypeface;
-            AttachmentsIcon.Typeface = _faTypeface;
-            MoreButton.Typeface = _miTypeface;
-
-            var small = (float)Device.GetNamedSize(NamedSize.Small, typeof(Label));
-            Icon.SetTextSize(ComplexUnitType.Pt, 10);
-            Name.SetTextSize(ComplexUnitType.Sp, (float)Device.GetNamedSize(NamedSize.Medium, typeof(Label)));
-            SubTitle.SetTextSize(ComplexUnitType.Sp, small);
-            SharedIcon.SetTextSize(ComplexUnitType.Sp, small);
-            AttachmentsIcon.SetTextSize(ComplexUnitType.Sp, small);
-            MoreButton.SetTextSize(ComplexUnitType.Sp, 25);
-
-            AddView(view);
-        }
-
-        public CipherViewCell CipherViewCell { get; set; }
-        public Element Element => CipherViewCell;
-
-        public IconImageView IconImage { get; set; }
-        public TextView Icon { get; set; }
-        public TextView Name { get; set; }
-        public TextView SubTitle { get; set; }
-        public TextView SharedIcon { get; set; }
-        public TextView AttachmentsIcon { get; set; }
-        public Android.Widget.Button MoreButton { get; set; }
-
-        public void UpdateCell(CipherViewCell cipherCell)
-        {
-            UpdateIconImage(cipherCell);
-
-            var cipher = cipherCell.Cipher;
-            Name.Text = cipher.Name;
-            if (!string.IsNullOrWhiteSpace(cipher.SubTitle))
-            {
-                SubTitle.Text = cipher.SubTitle;
-                SubTitle.Visibility = ViewStates.Visible;
-            }
-            else
-            {
-                SubTitle.Visibility = ViewStates.Invisible;
-            }
-            SharedIcon.Visibility = cipher.Shared ? ViewStates.Visible : ViewStates.Gone;
-            AttachmentsIcon.Visibility = cipher.HasAttachments ? ViewStates.Visible : ViewStates.Gone;
-        }
-
-        public void UpdateIconImage(CipherViewCell cipherCell)
-        {
-            if (_currentTask != null && !_currentTask.IsCancelled && !_currentTask.IsCompleted)
-            {
-                _currentTask.Cancel();
-            }
-
-            var cipher = cipherCell.Cipher;
-
-            var iconImage = cipherCell.GetIconImage(cipher);
-            if (iconImage.Item2 != null)
-            {
-                IconImage.SetImageResource(Resource.Drawable.login);
-                IconImage.Visibility = ViewStates.Visible;
-                Icon.Visibility = ViewStates.Gone;
-                _currentTask = ImageService.Instance.LoadUrl(iconImage.Item2).DownSample(64).Into(IconImage);
-                IconImage.Key = iconImage.Item2;
-            }
-            else
-            {
-                IconImage.Visibility = ViewStates.Gone;
-                Icon.Visibility = ViewStates.Visible;
-                Icon.Text = iconImage.Item1;
-            }
-        }
-
-        public void UpdateColors(Android.Graphics.Color textColor, Android.Graphics.Color mutedColor,
-            Android.Graphics.Color iconDisabledColor)
-        {
-            Name.SetTextColor(textColor);
-            SubTitle.SetTextColor(mutedColor);
-            Icon.SetTextColor(mutedColor);
-            SharedIcon.SetTextColor(mutedColor);
-            AttachmentsIcon.SetTextColor(mutedColor);
-            MoreButton.SetTextColor(iconDisabledColor);
-        }
-
-        private void MoreButton_Click(object sender, EventArgs e)
-        {
-            if (CipherViewCell.ButtonCommand?.CanExecute(CipherViewCell.Cipher) ?? false)
-            {
-                CipherViewCell.ButtonCommand.Execute(CipherViewCell.Cipher);
-            }
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                MoreButton.Click -= MoreButton_Click;
-            }
-            base.Dispose(disposing);
-        }
-    }
-
-    [Android.Runtime.Preserve(AllMembers = true)]
-    [Register("bit.droid.renderers.IconImageView")]
-    public class IconImageView : ImageViewAsync
-    {
-        public IconImageView(Context context) : base(context)
-        { }
-
-        public IconImageView(IntPtr javaReference, JniHandleOwnership transfer)
-            : base(javaReference, transfer)
-        { }
-
-        public IconImageView(Context context, IAttributeSet attrs)
-            : base(context, attrs)
-        { }
-
-        public string Key { get; set; }
-
-        protected override void JavaFinalize()
-        {
-            SetImageDrawable(null);
-            SetImageBitmap(null);
-            ImageService.Instance.InvalidateCacheEntryAsync(Key, FFImageLoading.Cache.CacheType.Memory);
-            base.JavaFinalize();
-        }
-    }
-}

src/Android/Renderers/ExtendedDatePickerRenderer.cs

@@ -0,0 +1,50 @@
+using System.ComponentModel;
+using Android.Content;
+using Android.Views;
+using Bit.App.Controls;
+using Bit.Droid.Renderers;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(ExtendedDatePicker), typeof(ExtendedDatePickerRenderer))]
+namespace Bit.Droid.Renderers
+{
+    public class ExtendedDatePickerRenderer : DatePickerRenderer
+    {
+        public ExtendedDatePickerRenderer(Context context)
+            : base(context) { }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<DatePicker> e)
+        {
+            base.OnElementChanged(e);
+            if (Control != null && Element is ExtendedDatePicker element)
+            {
+                // center text
+                Control.Gravity = GravityFlags.CenterHorizontal;
+
+                // use placeholder until NullableDate set 
+                if (!element.NullableDate.HasValue)
+                {
+                    Control.Text = element.PlaceHolder;
+                }
+            }
+        }
+
+        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == DatePicker.DateProperty.PropertyName ||
+                e.PropertyName == DatePicker.FormatProperty.PropertyName)
+            {
+                if (Control != null && Element is ExtendedDatePicker element)
+                {
+                    if (Element.Format == element.PlaceHolder)
+                    {
+                        Control.Text = element.PlaceHolder;
+                        return;
+                    }
+                }
+            }
+            base.OnElementPropertyChanged(sender, e);
+        }
+    }
+}

src/Android/Renderers/ExtendedGridRenderer.cs

@@ -0,0 +1,43 @@
+using Android.Content;
+using Bit.App.Controls;
+using Bit.App.Utilities;
+using Bit.Droid.Renderers;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(ExtendedGrid), typeof(ExtendedGridRenderer))]
+namespace Bit.Droid.Renderers
+{
+    public class ExtendedGridRenderer : ViewRenderer
+    {
+        private static int? _bgResId;
+
+        public ExtendedGridRenderer(Context context) : base(context) { }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<View> elementChangedEvent)
+        {
+            base.OnElementChanged(elementChangedEvent);
+            if (elementChangedEvent.NewElement != null)
+            {
+                SetBackgroundResource(GetBgResId());
+            }
+        }
+
+        private int GetBgResId()
+        {
+            if (_bgResId == null)
+            {
+                if (ThemeManager.GetTheme(true) == "nord")
+                {
+                    _bgResId = Resource.Drawable.list_item_bg_nord;
+                }
+                else
+                {
+                    _bgResId ??= ThemeManager.UsingLightTheme ? Resource.Drawable.list_item_bg :
+                        Resource.Drawable.list_item_bg_dark;
+                }
+            }
+            return _bgResId.Value;
+        }
+    }
+}

src/Android/Renderers/ExtendedListViewRenderer.cs

@@ -1,29 +0,0 @@
-using Android.Content;
-using Android.Views;
-using Bit.App.Controls;
-using Bit.Droid.Renderers;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(ExtendedListView), typeof(ExtendedListViewRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class ExtendedListViewRenderer : ListViewRenderer
-    {
-        public ExtendedListViewRenderer(Context context)
-            : base(context)
-        { }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<ListView> e)
-        {
-            base.OnElementChanged(e);
-            if (Control != null && e.NewElement != null && e.NewElement is ExtendedListView listView)
-            {
-                // Pad for FAB
-                Control.SetPadding(0, 0, 0, 170);
-                Control.SetClipToPadding(false);
-                Control.ScrollBarStyle = ScrollbarStyles.OutsideOverlay;
-            }
-        }
-    }
-}

src/Android/Renderers/ExtendedStackLayoutRenderer.cs

@@ -0,0 +1,43 @@
+using Android.Content;
+using Bit.App.Controls;
+using Bit.App.Utilities;
+using Bit.Droid.Renderers;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(ExtendedStackLayout), typeof(ExtendedStackLayoutRenderer))]
+namespace Bit.Droid.Renderers
+{
+    public class ExtendedStackLayoutRenderer : ViewRenderer
+    {
+        private static int? _bgResId;
+
+        public ExtendedStackLayoutRenderer(Context context) : base(context) { }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<View> elementChangedEvent)
+        {
+            base.OnElementChanged(elementChangedEvent);
+            if (elementChangedEvent.NewElement != null)
+            {
+                SetBackgroundResource(GetBgResId());
+            }
+        }
+
+        private int GetBgResId()
+        {
+            if (_bgResId == null)
+            {
+                if (ThemeManager.GetTheme(true) == "nord")
+                {
+                    _bgResId = Resource.Drawable.list_item_bg_nord;
+                }
+                else
+                {
+                    _bgResId ??= ThemeManager.UsingLightTheme ? Resource.Drawable.list_item_bg :
+                        Resource.Drawable.list_item_bg_dark;
+                }
+            }
+            return _bgResId.Value;
+        }
+    }
+}

src/Android/Renderers/ExtendedTimePickerRenderer.cs

@@ -0,0 +1,50 @@
+using System.ComponentModel;
+using Android.Content;
+using Android.Views;
+using Bit.App.Controls;
+using Bit.Droid.Renderers;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(ExtendedTimePicker), typeof(ExtendedTimePickerRenderer))]
+namespace Bit.Droid.Renderers
+{
+    public class ExtendedTimePickerRenderer : TimePickerRenderer
+    {
+        public ExtendedTimePickerRenderer(Context context)
+            : base(context) { }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<TimePicker> e)
+        {
+            base.OnElementChanged(e);
+            if (Control != null && Element is ExtendedTimePicker element)
+            {
+                // center text
+                Control.Gravity = GravityFlags.CenterHorizontal;
+
+                // use placeholder until NullableTime set 
+                if (!element.NullableTime.HasValue)
+                {
+                    Control.Text = element.PlaceHolder;
+                }
+            }
+        }
+
+        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == TimePicker.TimeProperty.PropertyName ||
+                e.PropertyName == TimePicker.FormatProperty.PropertyName)
+            {
+                if (Control != null && Element is ExtendedTimePicker element)
+                {
+                    if (Element.Format == element.PlaceHolder)
+                    {
+                        Control.Text = element.PlaceHolder;
+                        return;
+                    }
+                }
+            }
+            base.OnElementPropertyChanged(sender, e);
+        }
+    }
+}

src/Android/Resources/drawable/info.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+</vector>

src/Android/Resources/drawable/list_item_bg.xml

@@ -0,0 +1,7 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/itemPressed">
+
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@android:color/white" />
+</ripple>

src/Android/Resources/drawable/list_item_bg_dark.xml

@@ -0,0 +1,7 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/dark_primary">
+
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@android:color/white" />
+</ripple>

src/Android/Resources/drawable/list_item_bg_nord.xml

@@ -0,0 +1,7 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/nord_primary">
+
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@android:color/white" />
+</ripple>

src/Android/Resources/drawable/paper_plane.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="600"
+    android:viewportHeight="600">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M508.757,52.805L68.978,306.52C51.804,316.388 53.987,340.299 71.065,347.51L171.925,389.827L444.522,149.585C449.741,144.936 457.141,152.052 452.682,157.46L224.111,435.94L224.111,512.32C224.111,534.712 251.152,543.536 264.436,527.312L324.686,453.967L442.909,503.496C456.382,509.189 471.753,500.744 474.22,486.227L542.536,76.336C545.762,57.17 525.172,43.317 508.757,52.805Z" />
+</vector>

src/Android/Resources/layout/CipherViewCell.axml

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:minHeight="44dp"
-    android:gravity="center_vertical">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingLeft="2.2dp">
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="39.8dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:gravity="center">
-            <bit.droid.renderers.IconImageView
-                android:id="@+id/CipherCellIconImage"
-                android:layout_width="22dp"
-                android:layout_height="22dp"
-                android:layout_gravity="center"
-                android:gravity="center" />
-            <TextView
-                android:id="@+id/CipherCellIcon"
-                android:layout_width="26dp"
-                android:layout_height="26dp"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:text="[X]" />
-        </LinearLayout>
-        <LinearLayout
-            android:id="@+id/CipherCellContent"
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:layout_gravity="center_vertical"
-            android:gravity="center"
-            android:paddingVertical="7.65dp">
-            <LinearLayout
-                android:id="@+id/CipherCellContentTop"
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <TextView
-                    android:id="@+id/CipherCellName"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:text="Name" />
-                <TextView
-                    android:id="@+id/CipherCellSharedIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingLeft="5dp"
-                    android:singleLine="true"
-                    android:text="&#xf1e0;" />
-                <TextView
-                    android:id="@+id/CipherCellAttachmentsIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingLeft="5dp"
-                    android:singleLine="true"
-                    android:text="&#xf0c6;" />
-            </LinearLayout>
-            <TextView
-                android:id="@+id/CipherCellSubTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:text="SubTitle" />
-        </LinearLayout>
-        <Button
-            android:id="@+id/CipherCellButton"
-            android:layout_width="37dp"
-            android:layout_height="match_parent"
-            android:text="&#xe5d4;"
-            android:gravity="center"
-            android:padding="0dp"
-            android:background="@android:color/transparent" />
-    </LinearLayout>
-</RelativeLayout>

src/Android/Resources/values/colors.xml

@@ -6,6 +6,7 @@
   <color name="primary">#175DDC</color>
   <color name="notificationBar">#1452BC</color>
   <color name="border">#dddddd</color>
+  <color name="itemPressed">#bbbbbb</color>
 
   <!-- Dark theme -->
   <color name="dark_primary">#52bdfb</color>

src/Android/Resources/values/styles.xml

@@ -24,7 +24,6 @@
     <item name="colorControlNormal">@color/border</item>
     <item name="android:navigationBarColor">@android:color/black</item>
     <item name="windowActionModeOverlay">true</item>
-    <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
     <item name="android:colorActivatedHighlight">@android:color/transparent</item>
     <item name="android:textCursorDrawable">@null</item>
     <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
@@ -47,7 +46,6 @@
     <item name="colorControlNormal">@color/dark_border</item>
     <item name="android:navigationBarColor">@color/dark_navigationBarBackground</item>
     <item name="windowActionModeOverlay">true</item>
-    <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
     <item name="android:colorActivatedHighlight">@android:color/transparent</item>
     <item name="android:textCursorDrawable">@null</item>
     <item name="popupTheme">@style/ThemeOverlay.AppCompat</item>
@@ -95,9 +93,4 @@
     <item name="android:colorBackground">@color/nord_popupBackground</item>
     <item name="android:textColor">@color/nord_popupText</item>
   </style>
-
-  <!-- Other theme components -->
-  <style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
-    <item name="colorAccent">#FF4081</item>
-  </style>
 </resources>

src/Android/Resources/xml/autofillservice.xml

@@ -11,6 +11,9 @@
   -->
 <autofill-service xmlns:android="http://schemas.android.com/apk/res/android"
     android:supportsInlineSuggestions="true">
+  <compatibility-package
+    android:name="alook.browser"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.amazon.cloud9"
     android:maxLongVersionCode="10000000000"/>
@@ -53,6 +56,12 @@
   <compatibility-package
     android:name="com.chrome.dev"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.cookiegames.smartcookie"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.cookiejarapps.android.smartcookieweb"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.ecosia.android"
     android:maxLongVersionCode="10000000000"/>
@@ -62,18 +71,33 @@
   <compatibility-package
     android:name="com.google.android.apps.chrome_dev"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.jamal2367.styx"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.kiwibrowser.browser"
     android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.microsoft.emmx"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.microsoft.emmx.beta"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.microsoft.emmx.canary"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.microsoft.emmx.dev"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.mmbox.browser"
     android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.mmbox.xbrowser"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.mycompany.app.soulbrowser"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.naver.whale"
     android:maxLongVersionCode="10000000000"/>
@@ -140,6 +164,18 @@
   <compatibility-package
     android:name="mark.via.gp"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="net.slions.fulguris.full.download"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="net.slions.fulguris.full.download.debug"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="net.slions.fulguris.full.playstore"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="net.slions.fulguris.full.playstore.debug"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="org.adblockplus.browser"
     android:maxLongVersionCode="10000000000"/>
@@ -191,13 +227,13 @@
   <compatibility-package
     android:name="org.torproject.torbrowser_alpha"
     android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="org.ungoogled.chromium"
-    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="org.ungoogled.chromium.extensions.stable"
     android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="org.ungoogled.chromium.stable"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="us.spotco.fennec_dos"
+    android:maxLongVersionCode="10000000000"/>
 </autofill-service>

src/Android/Services/DeviceActionService.cs

@@ -307,7 +307,7 @@ namespace Bit.Droid.Services
 
         public Task<string> DisplayPromptAync(string title = null, string description = null,
             string text = null, string okButtonText = null, string cancelButtonText = null,
-            bool numericKeyboard = false, bool autofocus = true)
+            bool numericKeyboard = false, bool autofocus = true, bool password = false)
         {
             var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
             if (activity == null)
@@ -333,6 +333,10 @@ namespace Bit.Droid.Services
                 input.KeyListener = DigitsKeyListener.GetInstance(false, false);
 #pragma warning restore CS0618 // Type or member is obsolete
             }
+            if (password)
+            {
+                input.InputType = InputTypes.TextVariationPassword | InputTypes.ClassText;
+            }
 
             input.ImeOptions = input.ImeOptions | (ImeAction)ImeFlags.NoPersonalizedLearning |
                 (ImeAction)ImeFlags.NoExtractUi;
@@ -752,6 +756,31 @@ namespace Bit.Droid.Services
             return false;
         }
 
+        public long GetActiveTime()
+        {
+            // Returns milliseconds since the system was booted, and includes deep sleep. This clock is guaranteed to
+            // be monotonic, and continues to tick even when the CPU is in power saving modes, so is the recommend
+            // basis for general purpose interval timing.
+            // ref: https://developer.android.com/reference/android/os/SystemClock#elapsedRealtime()
+            return SystemClock.ElapsedRealtime();
+        }
+        
+        public void CloseMainApp()
+        {
+            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
+            if (activity == null)
+            {
+                return;
+            }
+            activity.Finish();
+            _messagingService.Send("finishMainActivity");
+        }
+
+        public bool SupportsFido2()
+        {
+            return true;
+        }
+
         private bool DeleteDir(Java.IO.File dir)
         {
             if (dir != null && dir.IsDirectory)

src/Android/WebAuthCallbackActivity.cs

@@ -3,7 +3,9 @@ using Android.Content.PM;
 
 namespace Bit.Droid
 {
-    [Activity(NoHistory = true, LaunchMode = LaunchMode.SingleTop)]
+    [Activity(
+        NoHistory = true, 
+        LaunchMode = LaunchMode.SingleTop)]
     [IntentFilter(new[] { Android.Content.Intent.ActionView },
         Categories = new[] { Android.Content.Intent.CategoryDefault, Android.Content.Intent.CategoryBrowsable },
         DataScheme = "bitwarden")]

src/Android/ci-build-apks.ps1

@@ -1,166 +0,0 @@
-$rootPath = $env:APPVEYOR_BUILD_FOLDER;
-
-$androidPath = $($rootPath + "\src\Android\Android.csproj");
-$appPath = $($rootPath + "\src\App\App.csproj");
-
-echo "########################################"
-echo "##### Increment Version"
-echo "########################################"
-
-$androidManifest = $($rootPath + "\src\Android\Properties\AndroidManifest.xml");
-
-$xml=New-Object XML;
-$xml.Load($androidManifest);
-
-$node=$xml.SelectNodes("/manifest");
-$node.SetAttribute("android:versionCode", $env:APPVEYOR_BUILD_NUMBER);
-
-$xml.Save($androidManifest);
-
-echo "########################################"
-echo "##### Decrypt Keystore"
-echo "########################################"
-
-$encKeystorePath = $($rootPath + "\src\Android\8bit.keystore.enc");
-$encFdroidKeystorePath = $($rootPath + "\src\Android\fdroid-keystore.jks.enc");
-$encUploadKeystorePath = $($rootPath + "\src\Android\upload-keystore.jks.enc");
-$secureFilePath = $($rootPath + "\secure-file\tools\secure-file.exe");
-
-Invoke-Expression "& `"$secureFilePath`" -decrypt $($encKeystorePath) -secret $($env:keystore_dec_secret)"
-Invoke-Expression "& `"$secureFilePath`" -decrypt $($encFdroidKeystorePath) -secret $($env:fdroid_apk_keystore_dec_secret)"
-Invoke-Expression "& `"$secureFilePath`" -decrypt $($encUploadKeystorePath) -secret $($env:upload_keystore_dec_secret)"
-
-echo "########################################"
-echo "##### Sign Google Play Bundle Release Configuration"
-echo "########################################"
-
-msbuild "$($androidPath)" "/t:SignAndroidPackage" "/p:Configuration=Release" "/p:AndroidKeyStore=true" `
-    "/p:AndroidSigningKeyAlias=upload" "/p:AndroidSigningKeyPass=$($env:upload_keystore_password)" `
-    "/p:AndroidSigningKeyStore=upload-keystore.jks" "/p:AndroidSigningStorePass=$($env:upload_keystore_password)" `
-    "/p:AndroidPackageFormat=aab" "/v:quiet"
-
-echo "########################################"
-echo "##### Copy Google Play Bundle to project root"
-echo "########################################"
-
-$signedAabPath = $($rootPath + "\src\Android\bin\Release\com.x8bit.bitwarden-Signed.aab");
-$signedAabDestPath = $($rootPath + "\com.x8bit.bitwarden.aab");
-
-Copy-Item $signedAabPath $signedAabDestPath
-
-echo "########################################"
-echo "##### Sign APK Release Configuration"
-echo "########################################"
-
-msbuild "$($androidPath)" "/t:SignAndroidPackage" "/p:Configuration=Release" "/p:AndroidKeyStore=true" `
-    "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:keystore_password)" `
-    "/p:AndroidSigningKeyStore=8bit.keystore" "/p:AndroidSigningStorePass=$($env:keystore_password)" "/v:quiet"
-	
-echo "########################################"
-echo "##### Copy Release APK to project root"
-echo "########################################"
-
-$signedApkPath = $($rootPath + "\src\Android\bin\Release\com.x8bit.bitwarden-Signed.apk");
-$signedApkDestPath = $($rootPath + "\com.x8bit.bitwarden.apk");
-
-Copy-Item $signedApkPath $signedApkDestPath
-
-echo "########################################"
-echo "##### Clean Android and App"
-echo "########################################"
-
-msbuild "$($androidPath)" "/t:Clean" "/p:Configuration=FDroid"
-msbuild "$($appPath)" "/t:Clean" "/p:Configuration=FDroid"
-
-echo "########################################"
-echo "##### Backup project files"
-echo "########################################"
-
-Copy-Item $androidManifest $($androidManifest + ".original");
-Copy-Item $androidPath $($androidPath + ".original");
-Copy-Item $appPath $($appPath + ".original");
-
-
-echo "########################################"
-echo "##### Cleanup Android Manifest"
-echo "########################################"
-
-$xml=New-Object XML;
-$xml.Load($androidManifest);
-
-$nsAndroid=New-Object System.Xml.XmlNamespaceManager($xml.NameTable);
-$nsAndroid.AddNamespace("android", "http://schemas.android.com/apk/res/android");
-
-$firebaseReceiver1=$xml.SelectSingleNode(`
-    "/manifest/application/receiver[@android:name='com.google.firebase.iid.FirebaseInstanceIdInternalReceiver']", `
-    $nsAndroid);
-$firebaseReceiver1.ParentNode.RemoveChild($firebaseReceiver1);
-
-$firebaseReceiver2=$xml.SelectSingleNode(`
-    "/manifest/application/receiver[@android:name='com.google.firebase.iid.FirebaseInstanceIdReceiver']", `
-    $nsAndroid);
-$firebaseReceiver2.ParentNode.RemoveChild($firebaseReceiver2);
-
-$xml.Save($androidManifest);
-
-echo "########################################"
-echo "##### Uninstall from Android.csproj"
-echo "########################################"
-
-$xml=New-Object XML;
-$xml.Load($androidPath);
-
-$ns=New-Object System.Xml.XmlNamespaceManager($xml.NameTable);
-$ns.AddNamespace("ns", $xml.DocumentElement.NamespaceURI);
-
-$firebaseNode=$xml.SelectSingleNode(`
-    "/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.Firebase.Messaging']", $ns);
-$firebaseNode.ParentNode.RemoveChild($firebaseNode);
-
-$safetyNetNode=$xml.SelectSingleNode(`
-    "/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.GooglePlayServices.SafetyNet']", $ns);
-$safetyNetNode.ParentNode.RemoveChild($safetyNetNode);
-
-$xml.Save($androidPath);
-
-echo "########################################"
-echo "##### Uninstall from App.csproj"
-echo "########################################"
-
-$xml=New-Object XML;
-$xml.Load($appPath);
-
-$appCenterNode=$xml.SelectSingleNode("/Project/ItemGroup/PackageReference[@Include='Microsoft.AppCenter.Crashes']");
-$appCenterNode.ParentNode.RemoveChild($appCenterNode);
-
-$xml.Save($appPath);
-
-echo "########################################"
-echo "##### Restore NuGet"
-echo "########################################"
-
-Invoke-Expression "& nuget restore"
-
-echo "########################################"
-echo "##### Build and Sign FDroid Configuration"
-echo "########################################"
-
-msbuild "$($androidPath)" "/logger:C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" `
-    "/p:Configuration=FDroid"
-msbuild "$($androidPath)" "/t:SignAndroidPackage" "/p:Configuration=FDroid" "/p:AndroidKeyStore=true" `
-    "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:fdroid_apk_keystore_password)" `
-    "/p:AndroidSigningKeyStore=fdroid-keystore.jks" "/p:AndroidSigningStorePass=$($env:fdroid_apk_keystore_password)" `
-    "/v:quiet"
-
-echo "########################################"
-echo "##### Copy FDroid apk to project root"
-echo "########################################"
-
-$signedApkPath = $($rootPath + "\src\Android\bin\FDroid\com.x8bit.bitwarden-Signed.apk");
-$signedApkDestPath = $($rootPath + "\com.x8bit.bitwarden-fdroid.apk");
-
-Copy-Item $signedApkPath $signedApkDestPath
-
-echo "########################################"
-echo "##### Done"
-echo "########################################"

src/App/Abstractions/IDeviceActionService.cs

@@ -19,7 +19,7 @@ namespace Bit.App.Abstractions
         Task SelectFileAsync();
         Task<string> DisplayPromptAync(string title = null, string description = null, string text = null,
             string okButtonText = null, string cancelButtonText = null, bool numericKeyboard = false,
-            bool autofocus = true);
+            bool autofocus = true, bool password = false);
         void RateApp();
         bool SupportsFaceBiometric();
         Task<bool> SupportsFaceBiometricAsync();
@@ -43,5 +43,8 @@ namespace Bit.App.Abstractions
         void OpenAccessibilityOverlayPermissionSettings();
         void OpenAutofillSettings();
         bool UsingDarkTheme();
+        long GetActiveTime();
+        void CloseMainApp();
+        bool SupportsFido2();
     }
 }

src/App/Abstractions/IPasswordRepromptService.cs

@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+
+namespace Bit.App.Abstractions
+{
+    public interface IPasswordRepromptService
+    {
+        string[] ProtectedFields { get; }
+
+        Task<bool> ShowPasswordPromptAsync();
+    }
+}

src/App/App.csproj

@@ -13,11 +13,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="3.2.1" />
-    <PackageReference Include="Plugin.Fingerprint" Version="2.1.2" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
+    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.3.0" />
+    <PackageReference Include="Plugin.Fingerprint" Version="2.1.4" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
     <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
-    <PackageReference Include="Xamarin.Forms" Version="4.5.0.725" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2083" />
     <PackageReference Include="ZXing.Net.Mobile" Version="2.4.1" />
     <PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.4.1" />
   </ItemGroup>
@@ -116,6 +116,10 @@
       <DependentUpon>ResetMasterPasswordPage.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="Pages\Send\SendGroupingsPage\SendGroupingsPage.xaml.cs">
+      <DependentUpon>SendGroupingsPage.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
@@ -407,4 +411,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
+</Project>

src/App/App.xaml.cs

@@ -131,7 +131,8 @@ namespace Bit.App
                     await SetMainPageAsync();
                 }
                 else if (message.Command == "popAllAndGoToTabGenerator" ||
-                    message.Command == "popAllAndGoToTabMyVault")
+                    message.Command == "popAllAndGoToTabMyVault" ||
+                    message.Command == "popAllAndGoToTabSend")
                 {
                     Device.BeginInvokeOnMainThread(async () =>
                     {
@@ -146,11 +147,15 @@ namespace Bit.App
                                 Options.MyVaultTile = false;
                                 tabsPage.ResetToVaultPage();
                             }
-                            else
+                            else if (message.Command == "popAllAndGoToTabGenerator")
                             {
                                 Options.GeneratorTile = false;
                                 tabsPage.ResetToGeneratorPage();
                             }
+                            else if (message.Command == "popAllAndGoToTabSend")
+                            {
+                                tabsPage.ResetToSendPage();
+                            }
                         }
                     });
                 }
@@ -173,6 +178,10 @@ namespace Bit.App
                     SyncIfNeeded();
                 }
             }
+            if (Device.RuntimePlatform == Device.Android)
+            {
+                await _vaultTimeoutService.CheckVaultTimeoutAsync();
+            }
             _messagingService.Send("startEventTimer");
         }
 
@@ -185,7 +194,7 @@ namespace Bit.App
                 var isLocked = await _vaultTimeoutService.IsLockedAsync();
                 if (!isLocked)
                 {
-                    await _storageService.SaveAsync(Constants.LastActiveKey, DateTime.UtcNow);
+                    await _storageService.SaveAsync(Constants.LastActiveTimeKey, _deviceActionService.GetActiveTime());
                 }
                 SetTabsPageFromAutofill(isLocked);
                 await SleptAsync();
@@ -210,7 +219,7 @@ namespace Bit.App
 
         private async void ResumedAsync()
         {
-            _messagingService.Send("cancelVaultTimeoutTimer");
+            await _vaultTimeoutService.CheckVaultTimeoutAsync();
             _messagingService.Send("startEventTimer");
             await ClearCacheIfNeededAsync();
             Prime();
@@ -243,7 +252,8 @@ namespace Bit.App
                 _collectionService.ClearAsync(userId),
                 _passwordGenerationService.ClearAsync(),
                 _vaultTimeoutService.ClearAsync(),
-                _stateService.PurgeAsync());
+                _stateService.PurgeAsync(),
+                _deviceActionService.ClearCacheAsync());
             _vaultTimeoutService.BiometricLocked = true;
             _searchService.ClearIndex();
             _authService.LogOut(() =>
@@ -273,6 +283,10 @@ namespace Bit.App
                 {
                     Current.MainPage = new NavigationPage(new AutofillCiphersPage(Options));
                 }
+                else if (Options.CreateSend != null)
+                {
+                    Current.MainPage = new NavigationPage(new SendAddEditPage(Options));
+                }
                 else
                 {
                     Current.MainPage = new TabsPage(Options);
@@ -302,11 +316,7 @@ namespace Bit.App
                 vaultTimeout = await _storageService.GetAsync<int?>(Constants.VaultTimeoutKey);
             }
             vaultTimeout = vaultTimeout.GetValueOrDefault(-1);
-            if (vaultTimeout > 0)
-            {
-                _messagingService.Send("scheduleVaultTimeoutTimer", vaultTimeout.Value);
-            }
-            else if (vaultTimeout == 0)
+            if (vaultTimeout == 0)
             {
                 var action = await _storageService.GetAsync<string>(Constants.VaultTimeoutActionKey);
                 if (action == "logOut")
@@ -399,10 +409,6 @@ namespace Bit.App
                     autoPromptBiometric = false;
                 }
             }
-            else if (autoPromptBiometric && Device.RuntimePlatform == Device.Android)
-            {
-                autoPromptBiometric = false;
-            }
             PreviousPageInfo lastPageBeforeLock = null;
             if (Current.MainPage is TabbedPage tabbedPage && tabbedPage.Navigation.ModalStack.Count > 0)
             {

src/App/Controls/CipherViewCell/CipherViewCell.xaml

@@ -1,114 +1,111 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ViewCell xmlns="http://xamarin.com/schemas/2014/forms"
-          xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-          x:Class="Bit.App.Controls.CipherViewCell"
-          xmlns:controls="clr-namespace:Bit.App.Controls"
-          xmlns:u="clr-namespace:Bit.App.Utilities"
-          xmlns:ff="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms">
+<controls:ExtendedGrid xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Bit.App.Controls.CipherViewCell"
+    xmlns:controls="clr-namespace:Bit.App.Controls"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    xmlns:ff="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms"
+    StyleClass="list-row, list-row-platform"
+    RowSpacing="0"
+    ColumnSpacing="0"
+    x:DataType="controls:CipherViewCellViewModel">
 
-    <Grid 
-        x:Name="_grid"
-        StyleClass="list-row, list-row-platform"
-        RowSpacing="0"
-        ColumnSpacing="0"
-        x:DataType="controls:CipherViewCellViewModel">
+    <Grid.Resources>
+          <u:IconGlyphConverter x:Key="iconGlyphConverter"/>
+          <u:IconImageConverter x:Key="iconImageConverter"/>
+          <u:InverseBoolConverter x:Key="inverseBool" />
+    </Grid.Resources>
 
-        <Grid.BindingContext>
-            <controls:CipherViewCellViewModel />
-        </Grid.BindingContext>
+    <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+    </Grid.RowDefinitions>
 
+    <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="40" />
+        <ColumnDefinition Width="*" />
+        <ColumnDefinition Width="60" />
+    </Grid.ColumnDefinitions>
+
+    <controls:FaLabel
+        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 Cipher, Converter={StaticResource iconImageConverter}}"
+        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="40" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="60" />
         </Grid.ColumnDefinitions>
 
+        <Label 
+            LineBreakMode="TailTruncation"
+            Grid.Column="0"
+            Grid.Row="0"
+            StyleClass="list-title, list-title-platform"
+            Text="{Binding Cipher.Name}" />
+        <Label
+            LineBreakMode="TailTruncation"
+            Grid.Column="0"
+            Grid.Row="1"
+            Grid.ColumnSpan="3"
+            StyleClass="list-subtitle, list-subtitle-platform"
+            Text="{Binding Cipher.SubTitle}" />
         <controls:FaLabel
-            x:Name="_icon"
+            Grid.Column="1"
             Grid.Row="0"
-            Grid.Column="0"
-            HorizontalOptions="Center"
+            HorizontalOptions="Start"
             VerticalOptions="Center"
-            StyleClass="list-icon, list-icon-platform"
-            AutomationProperties.IsInAccessibleTree="False" />
-
-        <ff:CachedImage
-            x:Name="_image"
-            Grid.Row="0"
-            Grid.Column="0"
-            BitmapOptimizations="True"
-            ErrorPlaceholder="login.png"
-            HorizontalOptions="Center"
-            VerticalOptions="Center"
-            WidthRequest="22"
-            HeightRequest="22"
-            IsVisible="False"
-            AutomationProperties.IsInAccessibleTree="False" />
-
-        <Grid RowSpacing="0" ColumnSpacing="0" Grid.Row="0" Grid.Column="1" VerticalOptions="Center">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <Label 
-                LineBreakMode="TailTruncation"
-                Grid.Column="0"
-                Grid.Row="0"
-                StyleClass="list-title, list-title-platform"
-                Text="{Binding Cipher.Name, Mode=OneWay}" />
-            <Label
-                LineBreakMode="TailTruncation"
-                Grid.Column="0"
-                Grid.Row="1"
-                Grid.ColumnSpan="3"
-                StyleClass="list-subtitle, list-subtitle-platform"
-                Text="{Binding Cipher.SubTitle, Mode=OneWay}" />
-            <controls:FaLabel
-                Grid.Column="1"
-                Grid.Row="0"
-                HorizontalOptions="Start"
-                VerticalOptions="Center"
-                StyleClass="list-title-icon"
-                Margin="5, 0, 0, 0"
-                Text="&#xf1e0;"
-                IsVisible="{Binding Cipher.Shared, Mode=OneWay}"
-                AutomationProperties.IsInAccessibleTree="True"
-                AutomationProperties.Name="{u:I18n Shared}" />
-            <controls:FaLabel
-                Grid.Column="2"
-                Grid.Row="0"
-                HorizontalOptions="Start"
-                VerticalOptions="Center"
-                StyleClass="list-title-icon"
-                Margin="5, 0, 0, 0"
-                Text="&#xf0c6;"
-                IsVisible="{Binding Cipher.HasAttachments, Mode=OneWay}"
-                AutomationProperties.IsInAccessibleTree="True"
-                AutomationProperties.Name="{u:I18n Attachments}" />
-        </Grid>
-
-        <controls:MiButton
-            Grid.Row="0"
-            Grid.Column="2"
-            Text="&#xe5d3;"
-            StyleClass="list-row-button, list-row-button-platform, btn-disabled"
-            Clicked="MoreButton_Clicked"
-            VerticalOptions="CenterAndExpand"
-            HorizontalOptions="EndAndExpand"
+            StyleClass="list-title-icon"
+            Margin="5, 0, 0, 0"
+            Text="&#xf1b2;"
+            IsVisible="{Binding Cipher.Shared, Mode=OneTime}"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Options}" />
-
+            AutomationProperties.Name="{u:I18n Shared}" />
+        <controls:FaLabel
+            Grid.Column="2"
+            Grid.Row="0"
+            HorizontalOptions="Start"
+            VerticalOptions="Center"
+            StyleClass="list-title-icon"
+            Margin="5, 0, 0, 0"
+            Text="&#xf0c6;"
+            IsVisible="{Binding Cipher.HasAttachments, Mode=OneTime}"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{u:I18n Attachments}" />
     </Grid>
 
-</ViewCell>
+    <controls:MiButton
+        Grid.Row="0"
+        Grid.Column="2"
+        Text="&#xe5d3;"
+        StyleClass="list-row-button, list-row-button-platform, btn-disabled"
+        Clicked="MoreButton_Clicked"
+        VerticalOptions="CenterAndExpand"
+        HorizontalOptions="EndAndExpand"
+        AutomationProperties.IsInAccessibleTree="True"
+        AutomationProperties.Name="{u:I18n Options}" />
+
+</controls:ExtendedGrid>

src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs

@@ -1,45 +1,26 @@
-using Bit.App.Pages;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
+using System;
 using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using System;
 using Xamarin.Forms;
 
 namespace Bit.App.Controls
 {
-    public partial class CipherViewCell : ViewCell
+    public partial class CipherViewCell : ExtendedGrid
     {
         public static readonly BindableProperty CipherProperty = BindableProperty.Create(
             nameof(Cipher), typeof(CipherView), typeof(CipherViewCell), default(CipherView), BindingMode.OneWay);
 
         public static readonly BindableProperty WebsiteIconsEnabledProperty = BindableProperty.Create(
-            nameof(WebsiteIconsEnabled), typeof(bool), typeof(CipherViewCell), true, BindingMode.OneWay);
+            nameof(WebsiteIconsEnabled), typeof(bool?), typeof(CipherViewCell));
 
         public static readonly BindableProperty ButtonCommandProperty = BindableProperty.Create(
             nameof(ButtonCommand), typeof(Command<CipherView>), typeof(CipherViewCell));
 
-        private readonly IEnvironmentService _environmentService;
-
-        private CipherViewCellViewModel _viewModel;
-        private bool _usingNativeCell;
-
         public CipherViewCell()
         {
-            _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
-            if (Device.RuntimePlatform == Device.iOS)
-            {
-                InitializeComponent();
-                _viewModel = _grid.BindingContext as CipherViewCellViewModel;
-            }
-            else
-            {
-                _usingNativeCell = true;
-            }
+            InitializeComponent();
         }
 
-        public bool WebsiteIconsEnabled
+        public bool? WebsiteIconsEnabled
         {
             get => (bool)GetValue(WebsiteIconsEnabledProperty);
             set => SetValue(WebsiteIconsEnabledProperty, value);
@@ -60,130 +41,31 @@ namespace Bit.App.Controls
         protected override void OnPropertyChanged(string propertyName = null)
         {
             base.OnPropertyChanged(propertyName);
-            if (_usingNativeCell)
-            {
-                return;
-            }
             if (propertyName == CipherProperty.PropertyName)
             {
-                _viewModel.Cipher = Cipher;
+                if (Cipher == null)
+                {
+                    return;
+                }
+                BindingContext = new CipherViewCellViewModel(Cipher, WebsiteIconsEnabled ?? false);
             }
-        }
-
-        protected override void OnBindingContextChanged()
-        {
-            base.OnBindingContextChanged();
-            if (_usingNativeCell)
+            else if (propertyName == WebsiteIconsEnabledProperty.PropertyName)
             {
-                return;
+                if (Cipher == null)
+                {
+                    return;
+                }
+                ((CipherViewCellViewModel)BindingContext).WebsiteIconsEnabled = WebsiteIconsEnabled ?? false;
             }
-
-            _image.Source = null;
-            CipherView cipher = null;
-            if (BindingContext is GroupingsPageListItem groupingsPageListItem)
-            {
-                cipher = groupingsPageListItem.Cipher;
-            }
-            else if (BindingContext is CipherView cv)
-            {
-                cipher = cv;
-            }
-            if (cipher != null)
-            {
-                var iconImage = GetIconImage(cipher);
-                if (iconImage.Item2 != null)
-                {
-                    _image.IsVisible = true;
-                    _icon.IsVisible = false;
-                    _image.Source = iconImage.Item2;
-                    _image.LoadingPlaceholder = "login.png";
-                }
-                else
-                {
-                    _image.IsVisible = false;
-                    _icon.IsVisible = true;
-                    _icon.Text = iconImage.Item1;
-                }
-            }
-        }
-
-        public Tuple<string, string> GetIconImage(CipherView cipher)
-        {
-            string icon = null;
-            string image = null;
-            switch (cipher.Type)
-            {
-                case CipherType.Login:
-                    var loginIconImage = GetLoginIconImage(cipher);
-                    icon = loginIconImage.Item1;
-                    image = loginIconImage.Item2;
-                    break;
-                case CipherType.SecureNote:
-                    icon = "";
-                    break;
-                case CipherType.Card:
-                    icon = "";
-                    break;
-                case CipherType.Identity:
-                    icon = "";
-                    break;
-                default:
-                    break;
-            }
-            return new Tuple<string, string>(icon, image);
-        }
-
-        private Tuple<string, string> GetLoginIconImage(CipherView cipher)
-        {
-            string icon = "";
-            string image = null;
-            if (cipher.Login.Uri != null)
-            {
-                var hostnameUri = cipher.Login.Uri;
-                var isWebsite = false;
-
-                if (hostnameUri.StartsWith(Constants.AndroidAppProtocol))
-                {
-                    icon = "";
-                }
-                else if (hostnameUri.StartsWith(Constants.iOSAppProtocol))
-                {
-                    icon = "";
-                }
-                else if (WebsiteIconsEnabled && !hostnameUri.Contains("://") && hostnameUri.Contains("."))
-                {
-                    hostnameUri = string.Concat("http://", hostnameUri);
-                    isWebsite = true;
-                }
-                else if (WebsiteIconsEnabled)
-                {
-                    isWebsite = hostnameUri.StartsWith("http") && hostnameUri.Contains(".");
-                }
-
-                if (WebsiteIconsEnabled && isWebsite)
-                {
-                    var hostname = CoreHelpers.GetHostname(hostnameUri);
-                    var iconsUrl = _environmentService.IconsUrl;
-                    if (string.IsNullOrWhiteSpace(iconsUrl))
-                    {
-                        if (!string.IsNullOrWhiteSpace(_environmentService.BaseUrl))
-                        {
-                            iconsUrl = string.Format("{0}/icons", _environmentService.BaseUrl);
-                        }
-                        else
-                        {
-                            iconsUrl = "https://icons.bitwarden.net";
-                        }
-                    }
-                    image = string.Format("{0}/{1}/icon.png", iconsUrl, hostname);
-                }
-            }
-            return new Tuple<string, string>(icon, image);
         }
 
         private void MoreButton_Clicked(object sender, EventArgs e)
         {
-            ButtonCommand?.Execute(Cipher);
+            var cipher = ((sender as MiButton)?.BindingContext as CipherViewCellViewModel)?.Cipher;
+            if (cipher != null)
+            {
+                ButtonCommand?.Execute(cipher);
+            }
         }
     }
 }

src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs

@@ -6,11 +6,30 @@ namespace Bit.App.Controls
     public class CipherViewCellViewModel : ExtendedViewModel
     {
         private CipherView _cipher;
+        private bool _websiteIconsEnabled;
+
+        public CipherViewCellViewModel(CipherView cipherView, bool websiteIconsEnabled)
+        {
+            Cipher = cipherView;
+            WebsiteIconsEnabled = websiteIconsEnabled;
+        }
 
         public CipherView Cipher
         {
             get => _cipher;
             set => SetProperty(ref _cipher, value);
         }
+
+        public bool WebsiteIconsEnabled
+        {
+            get => _websiteIconsEnabled;
+            set => SetProperty(ref _websiteIconsEnabled, value);
+        }
+
+        public bool ShowIconImage
+        {
+            get => WebsiteIconsEnabled && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri) &&
+                   Cipher.Login.Uri.StartsWith("http");
+        }
     }
 }

src/App/Controls/ExtendedCollectionView.cs

@@ -0,0 +1,8 @@
+using Xamarin.Forms;
+
+namespace Bit.App.Controls
+{
+    public class ExtendedCollectionView : CollectionView
+    {
+    }
+}

src/App/Controls/ExtendedDatePicker.cs

@@ -0,0 +1,86 @@
+using System;
+using Xamarin.Forms;
+
+namespace Bit.App.Controls
+{
+    public class ExtendedDatePicker : DatePicker
+    {
+        private string _format;
+
+        public static readonly BindableProperty PlaceHolderProperty = BindableProperty.Create(
+            nameof(PlaceHolder), typeof(string), typeof(ExtendedDatePicker));
+
+        public string PlaceHolder
+        {
+            get { return (string)GetValue(PlaceHolderProperty); }
+            set { SetValue(PlaceHolderProperty, value); }
+        }
+
+        public static readonly BindableProperty NullableDateProperty = BindableProperty.Create(
+            nameof(NullableDate), typeof(DateTime?), typeof(ExtendedDatePicker));
+
+        public DateTime? NullableDate
+        {
+            get { return (DateTime?)GetValue(NullableDateProperty); }
+            set
+            {
+                SetValue(NullableDateProperty, value);
+                UpdateDate();
+            }
+        }
+
+        private void UpdateDate()
+        {
+            if (NullableDate.HasValue)
+            {
+                if (_format != null)
+                {
+                    Format = _format;
+                }
+            }
+            else
+            {
+                Format = PlaceHolder;
+            }
+        }
+
+        protected override void OnBindingContextChanged()
+        {
+            base.OnBindingContextChanged();
+            if (BindingContext != null)
+            {
+                _format = Format;
+                UpdateDate();
+            }
+        }
+
+        protected override void OnPropertyChanged(string propertyName = null)
+        {
+            base.OnPropertyChanged(propertyName);
+
+            if (propertyName == DateProperty.PropertyName || (propertyName == IsFocusedProperty.PropertyName &&
+                                                              !IsFocused && (Date.ToString("d") ==
+                                                                             DateTime.Now.ToString("d"))))
+            {
+                NullableDate = Date;
+                UpdateDate();
+            }
+
+            if (propertyName == NullableDateProperty.PropertyName)
+            {
+                if (NullableDate.HasValue)
+                {
+                    Date = NullableDate.Value;
+                    if (Date.ToString(_format) == DateTime.Now.ToString(_format))
+                    {
+                        UpdateDate();
+                    }
+                }
+                else
+                {
+                    UpdateDate();
+                }
+            }
+        }
+    }
+}

src/App/Controls/ExtendedGrid.cs

@@ -0,0 +1,8 @@
+using Xamarin.Forms;
+
+namespace Bit.App.Controls
+{
+    public class ExtendedGrid : Grid
+    {
+    }
+}

src/App/Controls/ExtendedListView.cs

@@ -1,12 +0,0 @@
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class ExtendedListView : ListView
-    {
-        public ExtendedListView() { }
-
-        public ExtendedListView(ListViewCachingStrategy cachingStrategy)
-            : base(cachingStrategy) { }
-    }
-}

src/App/Controls/ExtendedStackLayout.cs

@@ -0,0 +1,8 @@
+using Xamarin.Forms;
+
+namespace Bit.App.Controls
+{
+    public class ExtendedStackLayout : StackLayout
+    {
+    }
+}

src/App/Controls/ExtendedTimePicker.cs

@@ -0,0 +1,86 @@
+using System;
+using Xamarin.Forms;
+
+namespace Bit.App.Controls
+{
+    public class ExtendedTimePicker : TimePicker
+    {
+        private string _format;
+
+        public static readonly BindableProperty PlaceHolderProperty = BindableProperty.Create(
+            nameof(PlaceHolder), typeof(string), typeof(ExtendedTimePicker));
+
+        public string PlaceHolder
+        {
+            get { return (string)GetValue(PlaceHolderProperty); }
+            set { SetValue(PlaceHolderProperty, value); }
+        }
+
+        public static readonly BindableProperty NullableTimeProperty = BindableProperty.Create(
+            nameof(NullableTime), typeof(TimeSpan?), typeof(ExtendedTimePicker));
+
+        public TimeSpan? NullableTime
+        {
+            get { return (TimeSpan?)GetValue(NullableTimeProperty); }
+            set
+            {
+                SetValue(NullableTimeProperty, value);
+                UpdateTime();
+            }
+        }
+
+        private void UpdateTime()
+        {
+            if (NullableTime.HasValue)
+            {
+                if (_format != null)
+                {
+                    Format = _format;
+                }
+            }
+            else
+            {
+                Format = PlaceHolder;
+            }
+        }
+
+        protected override void OnBindingContextChanged()
+        {
+            base.OnBindingContextChanged();
+            if (BindingContext != null)
+            {
+                _format = Format;
+                UpdateTime();
+            }
+        }
+
+        protected override void OnPropertyChanged(string propertyName = null)
+        {
+            base.OnPropertyChanged(propertyName);
+
+            if (propertyName == TimeProperty.PropertyName || (propertyName == IsFocusedProperty.PropertyName &&
+                                                              !IsFocused && (Time.ToString("t") ==
+                                                                             DateTime.Now.TimeOfDay.ToString("t"))))
+            {
+                NullableTime = Time;
+                UpdateTime();
+            }
+
+            if (propertyName == NullableTimeProperty.PropertyName)
+            {
+                if (NullableTime.HasValue)
+                {
+                    Time = NullableTime.Value;
+                    if (Time.ToString(_format) == DateTime.Now.TimeOfDay.ToString(_format))
+                    {
+                        UpdateTime();
+                    }
+                }
+                else
+                {
+                    UpdateTime();
+                }
+            }
+        }
+    }
+}

src/App/Controls/SendViewCell/SendViewCell.xaml

@@ -0,0 +1,132 @@
+<?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.SendViewCell"
+    xmlns:controls="clr-namespace:Bit.App.Controls"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    StyleClass="list-row, list-row-platform"
+    RowSpacing="0"
+    ColumnSpacing="0"
+    x:DataType="controls:SendViewCellViewModel">
+
+    <Grid.Resources>
+          <u:SendIconGlyphConverter x:Key="sendIconGlyphConverter"/>
+    </Grid.Resources>
+
+    <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+    </Grid.RowDefinitions>
+
+    <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="40" />
+        <ColumnDefinition Width="*" />
+        <ColumnDefinition Width="60" />
+    </Grid.ColumnDefinitions>
+
+    <controls:FaLabel
+        Grid.Row="0"
+        Grid.Column="0"
+        HorizontalOptions="Center"
+        VerticalOptions="Center"
+        StyleClass="list-icon, list-icon-platform"
+        Text="{Binding Send, Converter={StaticResource sendIconGlyphConverter}}"
+        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="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <Label
+            LineBreakMode="TailTruncation"
+            Grid.Column="0"
+            Grid.Row="0"
+            StyleClass="list-title, list-title-platform"
+            Text="{Binding Send.Name}" />
+        <Label
+            LineBreakMode="TailTruncation"
+            Grid.Column="0"
+            Grid.Row="1"
+            Grid.ColumnSpan="6"
+            StyleClass="list-subtitle, list-subtitle-platform"
+            Text="{Binding Send.DisplayDate}" />
+        <controls:FaLabel
+            Grid.Column="1"
+            Grid.Row="0"
+            HorizontalOptions="Start"
+            VerticalOptions="Center"
+            StyleClass="list-title-icon"
+            Margin="5, 0, 0, 0"
+            Text="&#xf071;"
+            IsVisible="{Binding Send.Disabled, Mode=OneTime}"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{u:I18n Disabled}" />
+        <controls:FaLabel
+            Grid.Column="2"
+            Grid.Row="0"
+            HorizontalOptions="Start"
+            VerticalOptions="Center"
+            StyleClass="list-title-icon"
+            Margin="5, 0, 0, 0"
+            Text="&#xf084;"
+            IsVisible="{Binding Send.HasPassword, Mode=OneTime}"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{u:I18n Password}" />
+        <controls:FaLabel
+            Grid.Column="3"
+            Grid.Row="0"
+            HorizontalOptions="Start"
+            VerticalOptions="Center"
+            StyleClass="list-title-icon"
+            Margin="5, 0, 0, 0"
+            Text="&#xf05e;"
+            IsVisible="{Binding Send.MaxAccessCountReached, Mode=OneTime}"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{u:I18n MaxAccessCountReached}" />
+        <controls:FaLabel
+            Grid.Column="4"
+            Grid.Row="0"
+            HorizontalOptions="Start"
+            VerticalOptions="Center"
+            StyleClass="list-title-icon"
+            Margin="5, 0, 0, 0"
+            Text="&#xf017;"
+            IsVisible="{Binding Send.Expired, Mode=OneTime}"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{u:I18n Expired}" />
+        <controls:FaLabel
+            Grid.Column="5"
+            Grid.Row="0"
+            HorizontalOptions="Start"
+            VerticalOptions="Center"
+            StyleClass="list-title-icon"
+            Margin="5, 0, 0, 0"
+            Text="&#xf1f8;"
+            IsVisible="{Binding Send.PendingDelete, Mode=OneTime}"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{u:I18n PendingDelete}" />
+    </Grid>
+
+    <controls:MiButton
+        Grid.Row="0"
+        Grid.Column="2"
+        Text="&#xe5d3;"
+        IsVisible="{Binding ShowOptions, Mode=OneWay}"
+        StyleClass="list-row-button, list-row-button-platform, btn-disabled"
+        Clicked="MoreButton_Clicked"
+        VerticalOptions="CenterAndExpand"
+        HorizontalOptions="EndAndExpand"
+        AutomationProperties.IsInAccessibleTree="True"
+        AutomationProperties.Name="{u:I18n Options}" />
+
+</controls:ExtendedGrid>

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

@@ -0,0 +1,63 @@
+using System;
+using Bit.Core.Models.View;
+using Xamarin.Forms;
+
+namespace Bit.App.Controls
+{
+    public partial class SendViewCell : ExtendedGrid
+    {
+        public static readonly BindableProperty SendProperty = BindableProperty.Create(
+            nameof(Send), typeof(SendView), typeof(SendViewCell), default(SendView), BindingMode.OneWay);
+
+        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);
+
+        public SendViewCell()
+        {
+            InitializeComponent();
+        }
+
+        public SendView Send
+        {
+            get => GetValue(SendProperty) as SendView;
+            set => SetValue(SendProperty, value);
+        }
+
+        public Command<SendView> ButtonCommand
+        {
+            get => GetValue(ButtonCommandProperty) as Command<SendView>;
+            set => SetValue(ButtonCommandProperty, value);
+        }
+
+        public bool ShowOptions
+        {
+            get => (bool)GetValue(ShowOptionsProperty);
+            set => SetValue(ShowOptionsProperty, value);
+        }
+
+        protected override void OnPropertyChanged(string propertyName = null)
+        {
+            base.OnPropertyChanged(propertyName);
+            if (propertyName == SendProperty.PropertyName)
+            {
+                if (Send == null)
+                {
+                    return;
+                }
+                BindingContext = new SendViewCellViewModel(Send, ShowOptions);
+            }
+        }
+
+        private void MoreButton_Clicked(object sender, EventArgs e)
+        {
+            var send = ((sender as MiButton)?.BindingContext as SendViewCellViewModel)?.Send;
+            if (send != null)
+            {
+                ButtonCommand?.Execute(send);
+            }
+        }
+    }
+}

src/App/Controls/SendViewCell/SendViewCellViewModel.cs

@@ -0,0 +1,29 @@
+using Bit.Core.Models.View;
+using Bit.Core.Utilities;
+
+namespace Bit.App.Controls
+{
+    public class SendViewCellViewModel : ExtendedViewModel
+    {
+        private SendView _send;
+        private bool _showOptions;
+
+        public SendViewCellViewModel(SendView sendView, bool showOptions)
+        {
+            Send = sendView;
+            ShowOptions = showOptions;
+        }
+
+        public SendView Send
+        {
+            get => _send;
+            set => SetProperty(ref _send, value);
+        }
+
+        public bool ShowOptions
+        {
+            get => _showOptions;
+            set => SetProperty(ref _showOptions, value);
+        }
+    }
+}

src/App/Models/AppOptions.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Enums;
+using System;
+using Bit.Core.Enums;
 
 namespace Bit.App.Models
 {
@@ -19,6 +20,7 @@ namespace Bit.App.Models
         public string SaveCardExpYear { get; set; }
         public string SaveCardCode { get; set; }
         public bool IosExtension { get; set; }
+        public Tuple<SendType, string, byte[], string> CreateSend { get; set; }
 
         public void SetAllFrom(AppOptions o)
         {
@@ -41,6 +43,7 @@ namespace Bit.App.Models
             SaveCardExpYear = o.SaveCardExpYear;
             SaveCardCode = o.SaveCardCode;
             IosExtension = o.IosExtension;
+            CreateSend = o.CreateSend;
         }
     }
 }

src/App/Models/PreviousPageInfo.cs

@@ -4,6 +4,7 @@
     {
         public string Page { get; set; }
         public string CipherId { get; set; }
+        public string SendId { get; set; }
         public string SearchText { get; set; }
     }
 }

src/App/Pages/Accounts/EnvironmentPage.xaml

@@ -13,7 +13,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Save}" Clicked="Submit_Clicked" />
     </ContentPage.ToolbarItems>
 

src/App/Pages/Accounts/HintPage.xaml

@@ -13,7 +13,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Submit}" Clicked="Submit_Clicked" />
     </ContentPage.ToolbarItems>
 

src/App/Pages/Accounts/LockPageViewModel.cs

@@ -8,6 +8,7 @@ using Bit.Core.Models.Domain;
 using Bit.Core.Utilities;
 using System;
 using System.Threading.Tasks;
+using Bit.App.Utilities;
 using Bit.Core.Models.Request;
 using Xamarin.Forms;
 
@@ -37,7 +38,6 @@ namespace Bit.App.Pages
         private string _biometricButtonText;
         private string _loggedInAsText;
         private string _lockedVerifyText;
-        private int _invalidPinAttempts = 0;
         private Tuple<bool, bool> _pinSet;
 
         public LockPageViewModel()
@@ -203,11 +203,12 @@ namespace Bit.App.Pages
                             _vaultTimeoutService.PinProtectedKey);
                         var encKey = await _cryptoService.GetEncKeyAsync(key);
                         var protectedPin = await _storageService.GetAsync<string>(Constants.ProtectedPin);
-                        var decPin = await _cryptoService.DecryptToUtf8Async(new CipherString(protectedPin), encKey);
+                        var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
                         failed = decPin != Pin;
                         if (!failed)
                         {
                             Pin = string.Empty;
+                            await AppHelpers.ResetInvalidUnlockAttemptsAsync();
                             await SetKeyAndContinueAsync(key);
                         }
                     }
@@ -217,6 +218,7 @@ namespace Bit.App.Pages
                             kdf.GetValueOrDefault(KdfType.PBKDF2_SHA256), kdfIterations.GetValueOrDefault(5000));
                         failed = false;
                         Pin = string.Empty;
+                        await AppHelpers.ResetInvalidUnlockAttemptsAsync();
                         await SetKeyAndContinueAsync(key);
                     }
                 }
@@ -226,8 +228,8 @@ namespace Bit.App.Pages
                 }
                 if (failed)
                 {
-                    _invalidPinAttempts++;
-                    if (_invalidPinAttempts >= 5)
+                    var invalidUnlockAttempts = await AppHelpers.IncrementInvalidUnlockAttemptsAsync();
+                    if (invalidUnlockAttempts >= 5)
                     {
                         _messagingService.Send("logout");
                         return;
@@ -239,32 +241,31 @@ namespace Bit.App.Pages
             else
             {
                 var key = await _cryptoService.MakeKeyAsync(MasterPassword, _email, kdf, kdfIterations);
-                var keyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key);
+                var storedKeyHash = await _cryptoService.GetKeyHashAsync();
                 var passwordValid = false;
-                if (keyHash != null)
+                
+                if (storedKeyHash != null)
                 {
-                    var storedKeyHash = await _cryptoService.GetKeyHashAsync();
-                    if (storedKeyHash != null)
+                    passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(MasterPassword, key);
+                }
+                else
+                {
+                    await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
+                    var keyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.ServerAuthorization);
+                    var request = new PasswordVerificationRequest();
+                    request.MasterPasswordHash = keyHash;
+                    try
                     {
-                        passwordValid = storedKeyHash == keyHash;
+                        await _apiService.PostAccountVerifyPasswordAsync(request);
+                        passwordValid = true;
+                        var localKeyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.LocalAuthorization);
+                        await _cryptoService.SetKeyHashAsync(localKeyHash);
                     }
-                    else
+                    catch (Exception e)
                     {
-                        await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
-                        var request = new PasswordVerificationRequest();
-                        request.MasterPasswordHash = keyHash;
-                        try
-                        {
-                            await _apiService.PostAccountVerifyPasswordAsync(request);
-                            passwordValid = true;
-                            await _cryptoService.SetKeyHashAsync(keyHash);
-                        }
-                        catch (Exception e)
-                        {
-                            System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", e.GetType(), e.StackTrace);
-                        }
-                        await _deviceActionService.HideLoadingAsync();
+                        System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", e.GetType(), e.StackTrace);
                     }
+                    await _deviceActionService.HideLoadingAsync();
                 }
                 if (passwordValid)
                 {
@@ -272,12 +273,13 @@ namespace Bit.App.Pages
                     {
                         var protectedPin = await _storageService.GetAsync<string>(Constants.ProtectedPin);
                         var encKey = await _cryptoService.GetEncKeyAsync(key);
-                        var decPin = await _cryptoService.DecryptToUtf8Async(new CipherString(protectedPin), encKey);
+                        var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
                         var pinKey = await _cryptoService.MakePinKeyAysnc(decPin, _email,
                             kdf.GetValueOrDefault(KdfType.PBKDF2_SHA256), kdfIterations.GetValueOrDefault(5000));
                         _vaultTimeoutService.PinProtectedKey = await _cryptoService.EncryptAsync(key.Key, pinKey);
                     }
                     MasterPassword = string.Empty;
+                    await AppHelpers.ResetInvalidUnlockAttemptsAsync();
                     await SetKeyAndContinueAsync(key);
 
                     // Re-enable biometrics
@@ -288,6 +290,12 @@ namespace Bit.App.Pages
                 }
                 else
                 {
+                    var invalidUnlockAttempts = await AppHelpers.IncrementInvalidUnlockAttemptsAsync();
+                    if (invalidUnlockAttempts >= 5)
+                    {
+                        _messagingService.Send("logout");
+                        return;
+                    }
                     await _platformUtilsService.ShowDialogAsync(AppResources.InvalidMasterPassword,
                         AppResources.AnErrorHasOccurred);
                 }

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

@@ -16,6 +16,8 @@ namespace Bit.App.Pages
         private readonly LoginPageViewModel _vm;
         private readonly AppOptions _appOptions;
 
+        private bool _inputFocused;
+
         public LoginPage(string email = null, AppOptions appOptions = null)
         {
             _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
@@ -58,13 +60,10 @@ namespace Bit.App.Pages
         {
             base.OnAppearing();
             await _vm.InitAsync();
-            if (string.IsNullOrWhiteSpace(_vm.Email))
+            if (!_inputFocused)
             {
-                RequestFocus(_email);
-            }
-            else
-            {
-                RequestFocus(_masterPassword);
+                RequestFocus(string.IsNullOrWhiteSpace(_vm.Email) ? _email : _masterPassword);
+                _inputFocused = true;
             }
         }
 

src/App/Pages/Accounts/LoginPageViewModel.cs

@@ -6,11 +6,17 @@ using Bit.Core.Exceptions;
 using Bit.Core.Utilities;
 using System;
 using System.Threading.Tasks;
+using Bit.App.Utilities;
 using Xamarin.Forms;
+using Newtonsoft.Json;
+using System.Text;
+using Xamarin.Essentials;
+using System.Text.RegularExpressions;
+using Bit.Core.Services;
 
 namespace Bit.App.Pages
 {
-    public class LoginPageViewModel : BaseViewModel
+    public class LoginPageViewModel : CaptchaProtectedViewModel
     {
         private const string Keys_RememberedEmail = "rememberedEmail";
         private const string Keys_RememberEmail = "rememberEmail";
@@ -21,6 +27,8 @@ namespace Bit.App.Pages
         private readonly IStorageService _storageService;
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IStateService _stateService;
+        private readonly IEnvironmentService _environmentService;
+        private readonly II18nService _i18nService;
 
         private bool _showPassword;
         private string _email;
@@ -34,6 +42,8 @@ namespace Bit.App.Pages
             _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
+            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
 
             PageTitle = AppResources.Bitwarden;
             TogglePasswordCommand = new Command(TogglePassword);
@@ -69,7 +79,12 @@ namespace Bit.App.Pages
         public Action StartTwoFactorAction { get; set; }
         public Action LogInSuccessAction { get; set; }
         public Action CloseAction { get; set; }
-                
+
+        protected override II18nService i18nService => _i18nService;
+        protected override IEnvironmentService environmentService => _environmentService;
+        protected override IDeviceActionService deviceActionService => _deviceActionService;
+        protected override IPlatformUtilsService platformUtilsService => _platformUtilsService;
+
         public async Task InitAsync()
         {
             if (string.IsNullOrWhiteSpace(Email))
@@ -80,7 +95,7 @@ namespace Bit.App.Pages
             RememberEmail = rememberEmail.GetValueOrDefault(true);
         }
 
-        public async Task LogInAsync()
+        public async Task LogInAsync(bool showLoading = true)
         {
             if (Xamarin.Essentials.Connectivity.NetworkAccess == Xamarin.Essentials.NetworkAccess.None)
             {
@@ -114,9 +129,12 @@ namespace Bit.App.Pages
             ShowPassword = false;
             try
             {
-                await _deviceActionService.ShowLoadingAsync(AppResources.LoggingIn);
-                var response = await _authService.LogInAsync(Email, MasterPassword);
-                MasterPassword = string.Empty;
+                if (showLoading)
+                {
+                    await _deviceActionService.ShowLoadingAsync(AppResources.LoggingIn);
+                }
+
+                var response = await _authService.LogInAsync(Email, MasterPassword, _captchaToken);
                 if (RememberEmail)
                 {
                     await _storageService.SaveAsync(Keys_RememberedEmail, Email);
@@ -125,7 +143,22 @@ namespace Bit.App.Pages
                 {
                     await _storageService.RemoveAsync(Keys_RememberedEmail);
                 }
+                await AppHelpers.ResetInvalidUnlockAttemptsAsync();
+
+                if (response.CaptchaNeeded)
+                {
+                    if (await HandleCaptchaAsync(response.CaptchaSiteKey))
+                    {
+                        await LogInAsync(false);
+                        _captchaToken = null;
+                    }
+                    return;
+                }
+                MasterPassword = string.Empty;
+                _captchaToken = null;
+
                 await _deviceActionService.HideLoadingAsync();
+
                 if (response.TwoFactor)
                 {
                     StartTwoFactorAction?.Invoke();
@@ -140,6 +173,8 @@ namespace Bit.App.Pages
             }
             catch (ApiException e)
             {
+                _captchaToken = null;
+                MasterPassword = string.Empty;
                 await _deviceActionService.HideLoadingAsync();
                 if (e?.Error != null)
                 {

src/App/Pages/Accounts/LoginSsoPage.xaml

@@ -13,8 +13,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
-        <ToolbarItem Text="{u:I18n LogIn}" Clicked="LogIn_Clicked" />
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
     </ContentPage.ToolbarItems>
 
     <ScrollView>
@@ -36,6 +35,10 @@
                         ReturnCommand="{Binding LogInCommand}" />
                 </StackLayout>
             </StackLayout>
+            <StackLayout Padding="10, 0">
+                <Button Text="{u:I18n LogIn}"
+                    Clicked="LogIn_Clicked"></Button>
+            </StackLayout>
         </StackLayout>
     </ScrollView>
 

src/App/Pages/Accounts/LoginSsoPageViewModel.cs

@@ -5,6 +5,7 @@ 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;
@@ -122,43 +123,28 @@ namespace Bit.App.Pages
                       "domain_hint=" + Uri.EscapeDataString(OrgIdentifier);
 
             WebAuthenticatorResult authResult = null;
-            bool cancelled = false;
             try
             {
                 authResult = await WebAuthenticator.AuthenticateAsync(new Uri(url),
                     new Uri(redirectUri));
             }
-            catch (TaskCanceledException taskCanceledException)
+            catch (TaskCanceledException)
+            {
+                // user canceled
+                await _deviceActionService.HideLoadingAsync();
+                return;
+            }
+
+            var code = GetResultCode(authResult, state);
+            if (!string.IsNullOrEmpty(code))
+            {
+                await LogIn(code, codeVerifier, redirectUri);
+            }
+            else
             {
                 await _deviceActionService.HideLoadingAsync();
-                cancelled = true;
-            }
-            catch (Exception e)
-            {
-                // WebAuthenticator throws NSErrorException if iOS flow is cancelled - by setting cancelled to true
-                // here we maintain the appearance of a clean cancellation (we don't want to do this across the board
-                // because we still want to present legitimate errors).  If/when this is fixed, we can remove this
-                // particular catch block (catching taskCanceledException above must remain)
-                // https://github.com/xamarin/Essentials/issues/1240
-                if (Device.RuntimePlatform == Device.iOS)
-                {
-                    await _deviceActionService.HideLoadingAsync();
-                    cancelled = true;
-                }
-            }
-            if (!cancelled)
-            {
-                var code = GetResultCode(authResult, state);
-                if (!string.IsNullOrEmpty(code))
-                {
-                    await LogIn(code, codeVerifier, redirectUri);
-                }
-                else
-                {
-                    await _deviceActionService.HideLoadingAsync();
-                    await _platformUtilsService.ShowDialogAsync(AppResources.LoginSsoError,
-                        AppResources.AnErrorHasOccurred);
-                }
+                await _platformUtilsService.ShowDialogAsync(AppResources.LoginSsoError,
+                    AppResources.AnErrorHasOccurred);
             }
         }
 
@@ -182,6 +168,7 @@ namespace Bit.App.Pages
             try
             {
                 var response = await _authService.LogInSsoAsync(code, codeVerifier, redirectUri);
+                await AppHelpers.ResetInvalidUnlockAttemptsAsync();
                 if (RememberOrgIdentifier)
                 {
                     await _storageService.SaveAsync(Keys_RememberedOrgIdentifier, OrgIdentifier);

src/App/Pages/Accounts/RegisterPage.xaml

@@ -20,7 +20,7 @@
     </ContentPage.Resources>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Submit}" Clicked="Submit_Clicked" />
     </ContentPage.ToolbarItems>
 

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

@@ -11,6 +11,8 @@ namespace Bit.App.Pages
         private readonly IMessagingService _messagingService;
         private readonly RegisterPageViewModel _vm;
 
+        private bool _inputFocused;
+
         public RegisterPage(HomePage homePage)
         {
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
@@ -45,7 +47,11 @@ namespace Bit.App.Pages
         protected override void OnAppearing()
         {
             base.OnAppearing();
-            RequestFocus(_email);
+            if (!_inputFocused)
+            {
+                RequestFocus(_email);
+                _inputFocused = true;
+            }
         }
 
         private async void Submit_Clicked(object sender, EventArgs e)

src/App/Pages/Accounts/RegisterPageViewModel.cs

@@ -12,9 +12,11 @@ using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
-    public class RegisterPageViewModel : BaseViewModel
+    public class RegisterPageViewModel : CaptchaProtectedViewModel
     {
         private readonly IDeviceActionService _deviceActionService;
+        private readonly II18nService _i18nService;
+        private readonly IEnvironmentService _environmentService;
         private readonly IApiService _apiService;
         private readonly ICryptoService _cryptoService;
         private readonly IPlatformUtilsService _platformUtilsService;
@@ -27,6 +29,8 @@ namespace Bit.App.Pages
             _apiService = ServiceContainer.Resolve<IApiService>("apiService");
             _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
+            _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
 
             PageTitle = AppResources.CreateAccount;
             TogglePasswordCommand = new Command(TogglePassword);
@@ -76,7 +80,12 @@ namespace Bit.App.Pages
         public Action RegistrationSuccess { get; set; }
         public Action CloseAction { get; set; }
 
-        public async Task SubmitAsync()
+        protected override II18nService i18nService => _i18nService;
+        protected override IEnvironmentService environmentService => _environmentService;
+        protected override IDeviceActionService deviceActionService => _deviceActionService;
+        protected override IPlatformUtilsService platformUtilsService => _platformUtilsService;
+
+        public async Task SubmitAsync(bool showLoading = true)
         {
             if (Xamarin.Essentials.Connectivity.NetworkAccess == Xamarin.Essentials.NetworkAccess.None)
             {
@@ -123,6 +132,11 @@ namespace Bit.App.Pages
             }
 
             // TODO: Password strength check?
+            
+            if (showLoading)
+            {
+                await _deviceActionService.ShowLoadingAsync(AppResources.CreatingAccount);
+            }
 
             Name = string.IsNullOrWhiteSpace(Name) ? null : Name;
             Email = Email.Trim().ToLower();
@@ -145,13 +159,13 @@ namespace Bit.App.Pages
                 {
                     PublicKey = keys.Item1,
                     EncryptedPrivateKey = keys.Item2.EncryptedString
-                }
+                },
+                CaptchaResponse = _captchaToken,
             };
             // TODO: org invite?
 
             try
             {
-                await _deviceActionService.ShowLoadingAsync(AppResources.CreatingAccount);
                 await _apiService.PostRegisterAsync(request);
                 await _deviceActionService.HideLoadingAsync();
                 _platformUtilsService.ShowToast("success", null, AppResources.AccountCreated,
@@ -163,6 +177,15 @@ namespace Bit.App.Pages
             }
             catch (ApiException e)
             {
+                if (e?.Error != null && e.Error.CaptchaRequired)
+                {
+                    if (await HandleCaptchaAsync(e.Error.CaptchaSiteKey))
+                    {
+                        await SubmitAsync(false);
+                        _captchaToken = null;
+                    }
+                    return;
+                }
                 await _deviceActionService.HideLoadingAsync();
                 if (e?.Error != null)
                 {

src/App/Pages/Accounts/SetPasswordPage.xaml

@@ -32,6 +32,28 @@
                        StyleClass="text-md"
                        HorizontalTextAlignment="Start"></Label>
                 </StackLayout>
+                <Grid IsVisible="{Binding ResetPasswordAutoEnroll}"
+                      RowSpacing="0"
+                      ColumnSpacing="0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Frame Padding="10"
+                           Margin="0, 12, 0, 0"
+                           HasShadow="False"
+                           BackgroundColor="Transparent"
+                           BorderColor="Accent">
+                        <Label
+                            Text="{u:I18n ResetPasswordAutoEnrollInviteWarning}"
+                            StyleClass="text-muted, text-sm, text-bold"
+                            HorizontalTextAlignment="Start" />
+                    </Frame>
+                </Grid>
                 <Grid IsVisible="{Binding IsPolicyInEffect}"
                       RowSpacing="0"
                       ColumnSpacing="0">
@@ -44,7 +66,7 @@
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <Frame Padding="10"
-                           Margin="0"
+                           Margin="0, 12, 0, 0"
                            HasShadow="False"
                            BackgroundColor="Transparent"
                            BorderColor="Accent">

src/App/Pages/Accounts/SetPasswordPageViewModel.cs

@@ -30,6 +30,7 @@ namespace Bit.App.Pages
 
         private bool _showPassword;
         private bool _isPolicyInEffect;
+        private bool _resetPasswordAutoEnroll;
         private string _policySummary;
         private MasterPasswordPolicyOptions _policy;
 
@@ -50,7 +51,6 @@ namespace Bit.App.Pages
             ToggleConfirmPasswordCommand = new Command(ToggleConfirmPassword);
             SubmitCommand = new Command(async () => await SubmitAsync());
         }
-
         public bool ShowPassword
         {
             get => _showPassword;
@@ -63,6 +63,12 @@ namespace Bit.App.Pages
             get => _isPolicyInEffect;
             set => SetProperty(ref _isPolicyInEffect, value);
         }
+        
+        public bool ResetPasswordAutoEnroll
+        {
+            get => _resetPasswordAutoEnroll;
+            set => SetProperty(ref _resetPasswordAutoEnroll, value);
+        }
 
         public string PolicySummary
         {
@@ -86,10 +92,26 @@ namespace Bit.App.Pages
         public Action SetPasswordSuccessAction { get; set; }
         public Action CloseAction { get; set; }
         public string OrgIdentifier { get; set; }
+        public string OrgId { get; set; }
 
         public async Task InitAsync()
         {
             await CheckPasswordPolicy();
+
+            try
+            {
+                var response = await _apiService.GetOrganizationAutoEnrollStatusAsync(OrgIdentifier);
+                OrgId = response.Id;
+                ResetPasswordAutoEnroll = response.ResetPasswordEnabled;
+            }
+            catch (ApiException e)
+            {
+                if (e?.Error != null)
+                {
+                    await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                        AppResources.AnErrorHasOccurred);
+                }
+            }
         }
 
         public async Task SubmitAsync()
@@ -138,9 +160,10 @@ namespace Bit.App.Pages
             var kdfIterations = 100000;
             var email = await _userService.GetEmailAsync();
             var key = await _cryptoService.MakeKeyAsync(MasterPassword, email, kdf, kdfIterations);
-            var masterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key);
+            var masterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.ServerAuthorization);
+            var localMasterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.LocalAuthorization);
 
-            Tuple<SymmetricCryptoKey, CipherString> encKey;
+            Tuple<SymmetricCryptoKey, EncString> encKey;
             var existingEncKey = await _cryptoService.GetEncKeyAsync();
             if (existingEncKey == null)
             {
@@ -170,13 +193,33 @@ namespace Bit.App.Pages
             try
             {
                 await _deviceActionService.ShowLoadingAsync(AppResources.CreatingAccount);
+                // Set Password and relevant information
                 await _apiService.SetPasswordAsync(request);
                 await _userService.SetInformationAsync(await _userService.GetUserIdAsync(),
                     await _userService.GetEmailAsync(), kdf, kdfIterations);
                 await _cryptoService.SetKeyAsync(key);
-                await _cryptoService.SetKeyHashAsync(masterPasswordHash);
+                await _cryptoService.SetKeyHashAsync(localMasterPasswordHash);
                 await _cryptoService.SetEncKeyAsync(encKey.Item2.EncryptedString);
                 await _cryptoService.SetEncPrivateKeyAsync(keys.Item2.EncryptedString);
+
+                if (ResetPasswordAutoEnroll)
+                {
+                    // Grab Organization Keys
+                    var response = await _apiService.GetOrganizationKeysAsync(OrgId);
+                    var publicKey = CoreHelpers.Base64UrlDecode(response.PublicKey);
+                    // Grab user's Encryption Key and encrypt with Org Public Key
+                    var userEncKey = await _cryptoService.GetEncKeyAsync();
+                    var encryptedKey = await _cryptoService.RsaEncryptAsync(userEncKey.Key, publicKey);
+                    // Request
+                    var resetRequest = new OrganizationUserResetPasswordEnrollmentRequest
+                    {
+                        ResetPasswordKey = encryptedKey.EncryptedString
+                    };
+                    var userId = await _userService.GetUserIdAsync();
+                    // Enroll user
+                    await _apiService.PutOrganizationUserResetPasswordEnrollmentAsync(OrgId, userId, resetRequest);
+                }
+                
                 await _deviceActionService.HideLoadingAsync();
 
                 SetPasswordSuccessAction?.Invoke();

src/App/Pages/Accounts/TwoFactorPage.xaml

@@ -16,14 +16,21 @@
     <ContentPage.ToolbarItems>
         <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
                      x:Name="_cancelItem" />
-        <ToolbarItem Text="{u:I18n Continue}" Clicked="Continue_Clicked" Order="Primary"
-                     x:Name="_continueItem" />
     </ContentPage.ToolbarItems>
 
     <ContentPage.Resources>
         <ResourceDictionary>
             <u:InverseBoolConverter x:Key="inverseBool" />
             <u:IsNullConverter x:Key="isNull" />
+            <ToolbarItem Icon="more_vert.png" Clicked="More_Clicked" Order="Primary"
+                x:Name="_moreItem" x:Key="moreItem"
+                 AutomationProperties.IsInAccessibleTree="True"
+                 AutomationProperties.Name="{u:I18n Options}" />
+            <ToolbarItem Text="{u:I18n UseAnotherTwoStepMethod}" 
+                Clicked="Methods_Clicked" 
+                Order="Secondary"
+                x:Name="_useAnotherTwoStepMethod" 
+                x:Key="useAnotherTwoStepMethod" />
         </ResourceDictionary>
     </ContentPage.Resources>
 
@@ -45,12 +52,13 @@
                             Keyboard="Numeric"
                             StyleClass="box-value"
                             ReturnType="Go"
-                            ReturnCommand="{Binding SubmitCommand}" />
+                            ReturnCommand="{Binding SubmitCommand}"
+                            TextChanged="Token_TextChanged"/>
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-switch">
                         <Label
                             Text="{u:I18n RememberMe}"
-                            StyleClass="box-label, box-label-regular"
+                            StyleClass="box-label-regular"
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding Remember}"
@@ -85,7 +93,31 @@
                     <StackLayout StyleClass="box-row, box-row-switch">
                         <Label
                             Text="{u:I18n RememberMe}"
-                            StyleClass="box-label, box-label-regular"
+                            StyleClass="box-label-regular"
+                            HorizontalOptions="StartAndExpand" />
+                        <Switch
+                            IsToggled="{Binding Remember}"
+                            StyleClass="box-value"
+                            HorizontalOptions="End" />
+                    </StackLayout>
+                </StackLayout>
+            </StackLayout>
+            <StackLayout Spacing="20" Padding="0" IsVisible="{Binding Fido2Method, Mode=OneWay}">
+                <Label
+                    Text="{u:I18n Fido2Instruction}"
+                    Margin="10, 20, 10, 0"
+                    HorizontalTextAlignment="Center" />
+                <Image
+                    Source="yubikey.png"
+                    Margin="10, 0"
+                    WidthRequest="266"
+                    HeightRequest="160"
+                    HorizontalOptions="Center" />
+                <StackLayout StyleClass="box">
+                    <StackLayout StyleClass="box-row, box-row-switch">
+                        <Label
+                            Text="{u:I18n RememberMe}"
+                            StyleClass="box-label-regular"
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding Remember}"
@@ -105,7 +137,7 @@
                     <StackLayout StyleClass="box-row, box-row-switch">
                         <Label
                             Text="{u:I18n RememberMe}"
-                            StyleClass="box-label, box-label-regular"
+                            StyleClass="box-label-regular"
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding Remember}"
@@ -123,6 +155,12 @@
                     Margin="10, 20, 10, 10"
                     HorizontalTextAlignment="Center" />
             </StackLayout>
+            <Button Text="{u:I18n Continue}"
+                    IsEnabled="{Binding EnableContinue}"
+                    IsVisible="{Binding ShowContinue}"
+                    Clicked="Continue_Clicked"
+                    Margin="10, 0"
+                    x:Name="_continue"></Button>
             <Button Text="{u:I18n SendVerificationCodeAgain}"
                     IsVisible="{Binding EmailMethod}"
                     Clicked="ResendEmail_Clicked"
@@ -131,9 +169,6 @@
                     IsVisible="{Binding ShowTryAgain}"
                     Clicked="TryAgain_Clicked"
                     Margin="10, 0"></Button>
-            <Button Text="{u:I18n UseAnotherTwoStepMethod}"
-                    Clicked="Methods_Clicked"
-                    Margin="10, 0"></Button>
         </StackLayout>
     </ScrollView>
 

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

@@ -1,5 +1,6 @@
 using Bit.App.Controls;
 using Bit.App.Models;
+using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using System;
@@ -45,26 +46,17 @@ namespace Bit.App.Pages
             {
                 ToolbarItems.Remove(_cancelItem);
             }
+            if (Device.RuntimePlatform == Device.iOS)
+            {
+                ToolbarItems.Add(_moreItem);
+            } else
+            {
+                ToolbarItems.Add(_useAnotherTwoStepMethod);
+            }
         }
 
         public HybridWebView DuoWebView { get; set; }
 
-        public void AddContinueButton()
-        {
-            if (!ToolbarItems.Contains(_continueItem))
-            {
-                ToolbarItems.Add(_continueItem);
-            }
-        }
-
-        public void RemoveContinueButton()
-        {
-            if (ToolbarItems.Contains(_continueItem))
-            {
-                ToolbarItems.Remove(_continueItem);
-            }
-        }
-
         protected async override void OnAppearing()
         {
             base.OnAppearing();
@@ -102,6 +94,9 @@ namespace Bit.App.Pages
                 if (_vm.TotpMethod)
                 {
                     RequestFocus(_totpEntry);
+                } else if (_vm.YubikeyMethod)
+                {
+                    RequestFocus(_yubikeyTokenEntry);
                 }
                 return Task.FromResult(0);
             });
@@ -142,6 +137,21 @@ namespace Bit.App.Pages
             }
         }
 
+        private async void More_Clicked(object sender, EventArgs e)
+        {
+            if (!DoOnce())
+            {
+                return;
+            }
+
+            var selection = await DisplayActionSheet(AppResources.Options, AppResources.Cancel, null, AppResources.UseAnotherTwoStepMethod);
+
+            if (selection == AppResources.UseAnotherTwoStepMethod)
+            {
+                await _vm.AnotherMethodAsync();
+            }
+        }
+
         private async void ResendEmail_Clicked(object sender, EventArgs e)
         {
             if (DoOnce())
@@ -158,11 +168,15 @@ namespace Bit.App.Pages
             }
         }
 
-        private void TryAgain_Clicked(object sender, EventArgs e)
+        private async void TryAgain_Clicked(object sender, EventArgs e)
         {
             if (DoOnce())
             {
-                if (_vm.YubikeyMethod)
+                if (_vm.Fido2Method)
+                {
+                    await _vm.Fido2AuthenticateAsync();
+                }
+                else if (_vm.YubikeyMethod)
                 {
                     _messagingService.Send("listenYubiKeyOTP", true);
                 }
@@ -192,5 +206,10 @@ namespace Bit.App.Pages
                 Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
             }
         }
+
+        private void Token_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            _vm.EnableContinue = !string.IsNullOrWhiteSpace(e.NewTextValue);
+        }
     }
 }

src/App/Pages/Accounts/TwoFactorPageViewModel.cs

@@ -7,9 +7,13 @@ 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;
 
 namespace Bit.App.Pages
@@ -27,11 +31,12 @@ namespace Bit.App.Pages
         private readonly IBroadcasterService _broadcasterService;
         private readonly IStateService _stateService;
 
-        private bool _u2fSupported = false;
         private TwoFactorProviderType? _selectedProviderType;
         private string _totpInstruction;
         private string _webVaultUrl = "https://vault.bitwarden.com";
         private bool _authingWithSso = false;
+        private bool _enableContinue = false;
+        private bool _showContinue = true;
 
         public TwoFactorPageViewModel()
         {
@@ -63,6 +68,8 @@ namespace Bit.App.Pages
         public bool DuoMethod => SelectedProviderType == TwoFactorProviderType.Duo ||
             SelectedProviderType == TwoFactorProviderType.OrganizationDuo;
 
+        public bool Fido2Method => SelectedProviderType == TwoFactorProviderType.Fido2WebAuthn;
+
         public bool YubikeyMethod => SelectedProviderType == TwoFactorProviderType.YubiKey;
 
         public bool AuthenticatorMethod => SelectedProviderType == TwoFactorProviderType.Authenticator;
@@ -71,7 +78,19 @@ namespace Bit.App.Pages
 
         public bool TotpMethod => AuthenticatorMethod || EmailMethod;
 
-        public bool ShowTryAgain => YubikeyMethod && Device.RuntimePlatform == Device.iOS;
+        public bool ShowTryAgain => (YubikeyMethod && Device.RuntimePlatform == Device.iOS) || Fido2Method;
+
+        public bool ShowContinue
+        {
+            get => _showContinue;
+            set => SetProperty(ref _showContinue, value);
+        }
+
+        public bool EnableContinue
+        {
+            get => _enableContinue;
+            set => SetProperty(ref _enableContinue, value);
+        }
 
         public string YubikeyInstruction => Device.RuntimePlatform == Device.iOS ? AppResources.YubiKeyInstructionIos :
             AppResources.YubiKeyInstruction;
@@ -83,6 +102,7 @@ namespace Bit.App.Pages
             {
                 nameof(EmailMethod),
                 nameof(DuoMethod),
+                nameof(Fido2Method),
                 nameof(YubikeyMethod),
                 nameof(AuthenticatorMethod),
                 nameof(TotpMethod),
@@ -114,10 +134,7 @@ namespace Bit.App.Pages
                 _webVaultUrl = _environmentService.WebVaultUrl;
             }
 
-            // TODO: init U2F
-            _u2fSupported = false;
-
-            SelectedProviderType = _authService.GetDefaultTwoFactorProvider(_u2fSupported);
+            SelectedProviderType = _authService.GetDefaultTwoFactorProvider(_platformUtilsService.SupportsFido2());
             Load();
         }
 
@@ -133,8 +150,8 @@ namespace Bit.App.Pages
             var providerData = _authService.TwoFactorProvidersData[SelectedProviderType.Value];
             switch (SelectedProviderType.Value)
             {
-                case TwoFactorProviderType.U2f:
-                    // TODO
+                case TwoFactorProviderType.Fido2WebAuthn:
+                    Fido2AuthenticateAsync(providerData);
                     break;
                 case TwoFactorProviderType.YubiKey:
                     _messagingService.Send("listenYubiKeyOTP", true);
@@ -169,17 +186,74 @@ namespace Bit.App.Pages
             {
                 _messagingService.Send("listenYubiKeyOTP", false);
             }
-            if (SelectedProviderType == null || DuoMethod)
+            ShowContinue = !(SelectedProviderType == null || DuoMethod || Fido2Method);
+        }
+
+        public async Task Fido2AuthenticateAsync(Dictionary<string, object> providerData = null)
+        {
+            await _deviceActionService.ShowLoadingAsync(AppResources.Validating);
+
+            if (providerData == null)
             {
-                page.RemoveContinueButton();
+                providerData = _authService.TwoFactorProvidersData[TwoFactorProviderType.Fido2WebAuthn];
+            }
+
+            var callbackUri = "bitwarden://webauthn-callback";
+            var data = AppHelpers.EncodeDataParameter(new
+            {
+                callbackUri = callbackUri,
+                data = JsonConvert.SerializeObject(providerData),
+                btnText = AppResources.Fido2AuthenticateWebAuthn,
+            });
+
+            var url = _webVaultUrl + "/webauthn-mobile-connector.html?" + "data=" + data +
+                      "&parent=" + Uri.EscapeDataString(callbackUri) + "&v=2";
+
+            WebAuthenticatorResult authResult = null;
+            try
+            {
+                var options = new WebAuthenticatorOptions
+                {
+                    Url = new Uri(url),
+                    CallbackUrl = new Uri(callbackUri),
+                    PrefersEphemeralWebBrowserSession = true,
+                };
+                authResult = await WebAuthenticator.AuthenticateAsync(options);
+            }
+            catch (TaskCanceledException)
+            {
+                // user canceled
+                await _deviceActionService.HideLoadingAsync();
+                return;
+            }
+
+            string response = null;
+            if (authResult != null && authResult.Properties.TryGetValue("data", out var resultData))
+            {
+                response = Uri.UnescapeDataString(resultData);
+            }
+            if (!string.IsNullOrWhiteSpace(response))
+            {
+                Token = response;
+                await SubmitAsync(false);
             }
             else
             {
-                page.AddContinueButton();
+                await _deviceActionService.HideLoadingAsync();
+                if (authResult != null && authResult.Properties.TryGetValue("error", out var resultError))
+                {
+                    var message = AppResources.Fido2CheckBrowser + "\n\n" + resultError;
+                    await _platformUtilsService.ShowDialogAsync(message, AppResources.AnErrorHasOccurred);
+                }
+                else
+                {
+                    await _platformUtilsService.ShowDialogAsync(AppResources.Fido2CheckBrowser,
+                        AppResources.AnErrorHasOccurred);
+                }
             }
         }
 
-        public async Task SubmitAsync()
+        public async Task SubmitAsync(bool showLoading = true)
         {
             if (SelectedProviderType == null)
             {
@@ -206,7 +280,10 @@ namespace Bit.App.Pages
 
             try
             {
-                await _deviceActionService.ShowLoadingAsync(AppResources.Validating);
+                if (showLoading)
+                {
+                    await _deviceActionService.ShowLoadingAsync(AppResources.Validating);
+                }
                 var result = await _authService.LogInTwoFactorAsync(SelectedProviderType.Value, Token, Remember);
                 var task = Task.Run(() => _syncService.FullSyncAsync(true));
                 await _deviceActionService.HideLoadingAsync();
@@ -245,7 +322,7 @@ namespace Bit.App.Pages
             {
                 _platformUtilsService.LaunchUri("https://help.bitwarden.com/article/lost-two-step-device/");
             }
-            else if (method != AppResources.Cancel)
+            else if (method != AppResources.Cancel && method != null)
             {
                 var selected = supportedProviders.FirstOrDefault(p => p.Name == method)?.Type;
                 if (selected == SelectedProviderType)

src/App/Pages/BaseContentPage.cs

@@ -3,6 +3,7 @@ using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using System;
 using System.Threading.Tasks;
+using Bit.App.Abstractions;
 using Xamarin.Forms;
 using Xamarin.Forms.PlatformConfiguration;
 using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
@@ -12,6 +13,7 @@ namespace Bit.App.Pages
     public class BaseContentPage : ContentPage
     {
         private IStorageService _storageService;
+        private IDeviceActionService _deviceActionService;
 
         protected int ShowModalAnimationDelay = 400;
         protected int ShowPageAnimationDelay = 100;
@@ -101,18 +103,22 @@ namespace Bit.App.Pages
             });
         }
 
-        private void SetStorageService()
+        private void SetServices()
         {
             if (_storageService == null)
             {
                 _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             }
+            if (_deviceActionService == null)
+            {
+                _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            }
         }
 
         private void SaveActivity()
         {
-            SetStorageService();
-            _storageService.SaveAsync(Constants.LastActiveKey, DateTime.UtcNow);
+            SetServices();
+            _storageService.SaveAsync(Constants.LastActiveTimeKey, _deviceActionService.GetActiveTime());
         }
     }
 }

src/App/Pages/CaptchaProtectedViewModel.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Threading.Tasks;
+using Bit.App.Abstractions;
+using Bit.App.Resources;
+using Bit.App.Utilities;
+using Bit.Core.Abstractions;
+using Xamarin.Essentials;
+
+namespace Bit.App.Pages
+{
+    public abstract class CaptchaProtectedViewModel : BaseViewModel
+    {
+        protected abstract II18nService i18nService { get; }
+        protected abstract IEnvironmentService environmentService { get; }
+        protected abstract IDeviceActionService deviceActionService { get; }
+        protected abstract IPlatformUtilsService platformUtilsService { get; }
+        protected string _captchaToken = null;
+
+        protected async Task<bool> HandleCaptchaAsync(string CaptchaSiteKey)
+        {
+            var callbackUri = "bitwarden://captcha-callback";
+            var data = AppHelpers.EncodeDataParameter(new
+            {
+                siteKey = CaptchaSiteKey,
+                locale = i18nService.Culture.TwoLetterISOLanguageName,
+                callbackUri = callbackUri,
+                captchaRequiredText = AppResources.CaptchaRequired,
+            });
+
+            var url = environmentService.GetWebVaultUrl() + "/captcha-mobile-connector.html?" + "data=" + data +
+                "&parent=" + Uri.EscapeDataString(callbackUri) + "&v=1";
+
+            WebAuthenticatorResult authResult = null;
+            bool cancelled = false;
+            try
+            {
+                var options = new WebAuthenticatorOptions
+                {
+                    Url = new Uri(url),
+                    CallbackUrl = new Uri(callbackUri),
+                    PrefersEphemeralWebBrowserSession = true,
+                };
+                authResult = await WebAuthenticator.AuthenticateAsync(options);
+            }
+            catch (TaskCanceledException)
+            {
+                await deviceActionService.HideLoadingAsync();
+                cancelled = true;
+            }
+
+            if (cancelled == false && authResult != null &&
+                authResult.Properties.TryGetValue("token", out _captchaToken))
+            {
+                return true;
+            }
+            else
+            {
+                await platformUtilsService.ShowDialogAsync(AppResources.CaptchaFailed,
+                    AppResources.CaptchaRequired);
+                return false;
+            }
+        }
+    }
+}

src/App/Pages/Generator/GeneratorHistoryPage.xaml

@@ -43,57 +43,53 @@
                VerticalOptions="CenterAndExpand"
                HorizontalOptions="CenterAndExpand"
                HorizontalTextAlignment="Center"></Label>
-        <ListView x:Name="_listView"
+        <controls:ExtendedCollectionView
                   IsVisible="{Binding ShowNoData, Converter={StaticResource inverseBool}}"
                   ItemsSource="{Binding History}"
                   VerticalOptions="FillAndExpand"
-                  HasUnevenRows="true"
-                  CachingStrategy="RecycleElement"
                   StyleClass="list, list-platform">
-            <ListView.ItemTemplate>
+            <CollectionView.ItemTemplate>
                 <DataTemplate x:DataType="domain:GeneratedPasswordHistory">
-                    <ViewCell>
-                        <Grid
-                            StyleClass="list-row, list-row-platform"
-                            Padding="10"
-                            RowSpacing="0"
-                            ColumnSpacing="10">
+                    <Grid
+                        StyleClass="list-row, list-row-platform"
+                        Padding="10"
+                        RowSpacing="0"
+                        ColumnSpacing="10">
 
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
 
-                            <controls:MonoLabel LineBreakMode="CharacterWrap"
-                                Grid.Column="0"
-                                Grid.Row="0"
-                                StyleClass="list-title, list-title-platform"
-                                TextType="Html"
-                                Text="{Binding Password, Mode=OneWay, Converter={StaticResource coloredPassword}}" />
-                            <Label LineBreakMode="TailTruncation"
-                                Grid.Column="0"
-                                Grid.Row="1"
-                                StyleClass="list-subtitle, list-subtitle-platform"
-                                Text="{Binding Date, Mode=OneWay, Converter={StaticResource dateTime}}" />
-                            <controls:FaButton
-                                StyleClass="list-row-button, list-row-button-platform"
-                                Text="&#xf24d;"
-                                Command="{Binding BindingContext.CopyCommand, Source={x:Reference _page}}"
-                                CommandParameter="{Binding .}"
-                                Grid.Row="0"
-                                Grid.Column="1"
-                                Grid.RowSpan="2"
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n CopyPassword}" />
-                        </Grid>
-                    </ViewCell>
+                        <controls:MonoLabel LineBreakMode="CharacterWrap"
+                            Grid.Column="0"
+                            Grid.Row="0"
+                            StyleClass="list-title, list-title-platform"
+                            TextType="Html"
+                            Text="{Binding Password, Mode=OneWay, Converter={StaticResource coloredPassword}}" />
+                        <Label LineBreakMode="TailTruncation"
+                            Grid.Column="0"
+                            Grid.Row="1"
+                            StyleClass="list-subtitle, list-subtitle-platform"
+                            Text="{Binding Date, Mode=OneWay, Converter={StaticResource dateTime}}" />
+                        <controls:FaButton
+                            StyleClass="list-row-button, list-row-button-platform"
+                            Text="&#xf0ea;"
+                            Command="{Binding BindingContext.CopyCommand, Source={x:Reference _page}}"
+                            CommandParameter="{Binding .}"
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Grid.RowSpan="2"
+                            AutomationProperties.IsInAccessibleTree="True"
+                            AutomationProperties.Name="{u:I18n CopyPassword}" />
+                    </Grid>
                 </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
+            </CollectionView.ItemTemplate>
+        </controls:ExtendedCollectionView>
     </StackLayout>
 
 </pages:BaseContentPage>

src/App/Pages/Generator/GeneratorPage.xaml

@@ -15,7 +15,7 @@
     <ContentPage.Resources>
         <ResourceDictionary>
             <u:InverseBoolConverter x:Key="inverseBool" />
-            <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
+            <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
                          x:Name="_closeItem" x:Key="closeItem" />
             <ToolbarItem Text="{u:I18n Select}"
                      Clicked="Select_Clicked"
@@ -98,12 +98,12 @@
                     <StackLayout StyleClass="box-row, box-row-stepper">
                         <Label
                             Text="{u:I18n NumberOfWords}"
-                            StyleClass="box-label, box-label-regular"
+                            StyleClass="box-label-regular"
                             VerticalOptions="FillAndExpand"
                             VerticalTextAlignment="Center" />
                         <Label
                             Text="{Binding NumWords}"
-                            StyleClass="box-label, box-sub-label"
+                            StyleClass="box-sub-label"
                             HorizontalOptions="FillAndExpand"
                             HorizontalTextAlignment="End"
                             VerticalOptions="FillAndExpand"
@@ -128,7 +128,7 @@
                     <StackLayout StyleClass="box-row, box-row-switch">
                         <Label
                             Text="{u:I18n Capitalize}"
-                            StyleClass="box-label, box-label-regular"
+                            StyleClass="box-label-regular"
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding Capitalize}"
@@ -141,7 +141,7 @@
                     <StackLayout StyleClass="box-row, box-row-switch">
                         <Label
                             Text="{u:I18n IncludeNumber}"
-                            StyleClass="box-label, box-label-regular"
+                            StyleClass="box-label-regular"
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding IncludeNumber}"
@@ -155,11 +155,11 @@
                     <StackLayout StyleClass="box-row, box-row-slider">
                         <Label
                             Text="{u:I18n Length}"
-                            StyleClass="box-label, box-label-regular"
+                            StyleClass="box-label-regular"
                             VerticalOptions="CenterAndExpand" />
                         <Label
                             Text="{Binding Length}"
-                            StyleClass="box-label, box-sub-label"
+                            StyleClass="box-sub-label"
                             WidthRequest="30"
                             VerticalOptions="CenterAndExpand"
                             HorizontalTextAlignment="End" />
@@ -177,7 +177,7 @@
                     <StackLayout StyleClass="box-row, box-row-switch">
                         <Label
                             Text="A-Z"
-                            StyleClass="box-label, box-label-regular"
+                            StyleClass="box-label-regular"
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding Uppercase}"
@@ -190,7 +190,7 @@
                     <StackLayout StyleClass="box-row, box-row-switch">
                         <Label
                             Text="a-z"
-                            StyleClass="box-label, box-label-regular"
+                            StyleClass="box-label-regular"
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding Lowercase}"
@@ -203,7 +203,7 @@
                     <StackLayout StyleClass="box-row, box-row-switch">
                         <Label
                             Text="0-9"
-                            StyleClass="box-label, box-label-regular"
+                            StyleClass="box-label-regular"
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding Number}"
@@ -216,7 +216,7 @@
                     <StackLayout StyleClass="box-row, box-row-switch">
                         <Label
                             Text="!@#$%^&amp;*"
-                            StyleClass="box-label, box-label-regular"
+                            StyleClass="box-label-regular"
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding Special}"
@@ -229,12 +229,12 @@
                     <StackLayout StyleClass="box-row, box-row-stepper">
                         <Label
                             Text="{u:I18n MinNumbers}"
-                            StyleClass="box-label, box-label-regular"
+                            StyleClass="box-label-regular"
                             VerticalOptions="FillAndExpand"
                             VerticalTextAlignment="Center" />
                         <Label
                             Text="{Binding MinNumber}"
-                            StyleClass="box-label, box-sub-label"
+                            StyleClass="box-sub-label"
                             HorizontalOptions="FillAndExpand"
                             HorizontalTextAlignment="End"
                             VerticalOptions="FillAndExpand"
@@ -249,12 +249,12 @@
                     <StackLayout StyleClass="box-row, box-row-stepper">
                         <Label
                             Text="{u:I18n MinSpecial}"
-                            StyleClass="box-label, box-label-regular"
+                            StyleClass="box-label-regular"
                             VerticalOptions="FillAndExpand"
                             VerticalTextAlignment="Center" />
                         <Label
                             Text="{Binding MinSpecial}"
-                            StyleClass="box-label, box-sub-label"
+                            StyleClass="box-sub-label"
                             HorizontalOptions="FillAndExpand"
                             HorizontalTextAlignment="End"
                             VerticalOptions="FillAndExpand"
@@ -269,7 +269,7 @@
                     <StackLayout StyleClass="box-row, box-row-switch">
                         <Label
                             Text="{u:I18n AvoidAmbiguousCharacters}"
-                            StyleClass="box-label, box-label-regular"
+                            StyleClass="box-label-regular"
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding AvoidAmbiguous}"

src/App/Pages/Send/SendAddEditPage.xaml

@@ -0,0 +1,538 @@
+<?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.SendAddEditPage"
+    xmlns:pages="clr-namespace:Bit.App.Pages"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    xmlns:controls="clr-namespace:Bit.App.Controls"
+    x:DataType="pages:SendAddEditPageViewModel"
+    x:Name="_page"
+    Title="{Binding PageTitle}">
+    <ContentPage.BindingContext>
+        <pages:SendAddEditPageViewModel />
+    </ContentPage.BindingContext>
+
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Save}" Clicked="Save_Clicked" Order="Primary"
+                     x:Key="saveItem" x:Name="_saveItem"/>
+    </ContentPage.ToolbarItems>
+
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <u:InverseBoolConverter x:Key="inverseBool" />
+            <u:IsNullConverter x:Key="null" />
+            <u:IsNotNullConverter x:Key="notNull" />
+            <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
+                         x:Key="closeItem" x:Name="_closeItem" />
+            <ToolbarItem Icon="more_vert.png" Clicked="More_Clicked" Order="Primary" x:Name="_moreItem"
+                         x:Key="moreItem"
+                         AutomationProperties.IsInAccessibleTree="True"
+                         AutomationProperties.Name="{u:I18n Options}" />
+            <ToolbarItem Text="{u:I18n RemovePassword}"
+                         Clicked="RemovePassword_Clicked"
+                         Order="Secondary"
+                         IsDestructive="True"
+                         x:Name="_removePassword"
+                         x:Key="removePassword" />
+            <ToolbarItem Text="{u:I18n CopyLink}"
+                         Clicked="CopyLink_Clicked"
+                         Order="Secondary"
+                         IsDestructive="True"
+                         x:Name="_copyLink"
+                         x:Key="copyLink" />
+            <ToolbarItem Text="{u:I18n ShareLink}"
+                         Clicked="ShareLink_Clicked"
+                         Order="Secondary"
+                         IsDestructive="True"
+                         x:Name="_shareLink"
+                         x:Key="shareLink" />
+            <ToolbarItem Text="{u:I18n Delete}"
+                         Clicked="Delete_Clicked"
+                         Order="Secondary"
+                         IsDestructive="True"
+                         x:Name="_deleteItem"
+                         x:Key="deleteItem" />
+
+            <Style x:Key="segmentedButtonBase" TargetType="Button">
+                <Setter Property="HeightRequest" Value="{Binding SegmentedButtonHeight}" />
+                <Setter Property="FontSize" Value="{Binding SegmentedButtonFontSize}" />
+                <Setter Property="CornerRadius" Value="0" />
+            </Style>
+            <Style x:Key="segmentedButtonNormal" BaseResourceKey="segmentedButtonBase" TargetType="Button">
+                <Setter Property="TextColor" Value="{StaticResource PrimaryColor}" />
+                <Setter Property="FontAttributes" Value="None" />
+                <Setter Property="BackgroundColor" Value="Transparent" />
+                <Setter Property="BorderColor" Value="{StaticResource PrimaryColor}" />
+                <Setter Property="BorderWidth" Value="1" />
+
+            </Style>
+            <Style x:Key="segmentedButtonDisabled" BaseResourceKey="segmentedButtonBase" TargetType="Button">
+                <Setter Property="TextColor" Value="{StaticResource TitleTextColor}" />
+                <Setter Property="FontAttributes" Value="Bold" />
+                <Setter Property="BackgroundColor" Value="{StaticResource PrimaryColor}" />
+                <Setter Property="BorderWidth" Value="0" />
+            </Style>
+
+            <ScrollView x:Key="scrollView" x:Name="_scrollView">
+                <StackLayout Spacing="20">
+                    <StackLayout StyleClass="box">
+                        <Frame
+                            IsVisible="{Binding SendEnabled, Converter={StaticResource inverseBool}}"
+                            Padding="10"
+                            Margin="0, 12, 0, 0"
+                            HasShadow="False"
+                            BackgroundColor="Transparent"
+                            BorderColor="Accent">
+                            <Label
+                                Text="{u:I18n SendDisabledWarning}"
+                                StyleClass="text-muted, text-sm, text-bold"
+                                HorizontalTextAlignment="Center" />
+                        </Frame>
+                        <Frame
+                            IsVisible="{Binding SendOptionsPolicyInEffect}"
+                            Padding="10"
+                            Margin="0, 12, 0, 0"
+                            HasShadow="False"
+                            BackgroundColor="Transparent"
+                            BorderColor="Accent">
+                            <Label
+                                Text="{u:I18n SendOptionsPolicyInEffect}"
+                                StyleClass="text-muted, text-sm, text-bold"
+                                HorizontalTextAlignment="Center" />
+                        </Frame>
+                        <StackLayout StyleClass="box-row">
+                            <Label
+                                Text="{u:I18n Name}"
+                                StyleClass="box-label" />
+                            <Entry
+                                x:Name="_nameEntry"
+                                Text="{Binding Send.Name}"
+                                IsEnabled="{Binding SendEnabled}"
+                                StyleClass="box-value" />
+                            <Label
+                                Text="{u:I18n NameInfo}"
+                                StyleClass="box-footer-label"
+                                Margin="0,5,0,0" />
+                        </StackLayout>
+                        <StackLayout
+                            StyleClass="box-row"
+                            IsVisible="{Binding ShowTypeButtons}">
+                            <Label
+                                Text="{u:I18n Type}"
+                                StyleClass="box-label" />
+                            <Grid
+                                RowSpacing="0"
+                                ColumnSpacing="0"
+                                Margin="{Binding SegmentedButtonMargins}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Button
+                                    Text="{u:I18n TypeFile}"
+                                    IsEnabled="{Binding IsText}"
+                                    Clicked="FileType_Clicked"
+                                    AutomationProperties.IsInAccessibleTree="True"
+                                    AutomationProperties.Name="{u:I18n File}"
+                                    Grid.Column="0">
+                                    <VisualStateManager.VisualStateGroups>
+                                        <VisualStateGroup x:Name="CommonStates">
+                                            <VisualState x:Name="Normal">
+                                                <VisualState.Setters>
+                                                    <Setter Property="Style"
+                                                            Value="{StaticResource segmentedButtonNormal}" />
+                                                </VisualState.Setters>
+                                            </VisualState>
+                                            <VisualState x:Name="Disabled">
+                                                <VisualState.Setters>
+                                                    <Setter Property="Style"
+                                                            Value="{StaticResource segmentedButtonDisabled}" />
+                                                </VisualState.Setters>
+                                            </VisualState>
+                                        </VisualStateGroup>
+                                    </VisualStateManager.VisualStateGroups>
+                                </Button>
+                                <Button
+                                    Text="{u:I18n TypeText}"
+                                    IsEnabled="{Binding IsFile}"
+                                    Clicked="TextType_Clicked"
+                                    AutomationProperties.IsInAccessibleTree="True"
+                                    AutomationProperties.Name="{u:I18n Text}"
+                                    Grid.Column="1">
+                                    <VisualStateManager.VisualStateGroups>
+                                        <VisualStateGroup x:Name="CommonStates">
+                                            <VisualState x:Name="Normal">
+                                                <VisualState.Setters>
+                                                    <Setter Property="Style"
+                                                            Value="{StaticResource segmentedButtonNormal}" />
+                                                </VisualState.Setters>
+                                            </VisualState>
+                                            <VisualState x:Name="Disabled">
+                                                <VisualState.Setters>
+                                                    <Setter Property="Style"
+                                                            Value="{StaticResource segmentedButtonDisabled}" />
+                                                </VisualState.Setters>
+                                            </VisualState>
+                                        </VisualStateGroup>
+                                    </VisualStateManager.VisualStateGroups>
+                                </Button>
+                            </Grid>
+                        </StackLayout>
+                        <StackLayout
+                            StyleClass="box-row"
+                            IsVisible="{Binding IsFile}">
+                            <Label
+                                Text="{u:I18n TypeFile}"
+                                StyleClass="box-label" />
+                            <StackLayout 
+                                IsVisible="{Binding EditMode}"
+                                Orientation="Horizontal">
+                                <Label
+                                    Text="{Binding Send.File.FileName, Mode=OneWay}"
+                                    StyleClass="box-value"
+                                    VerticalTextAlignment="Center"
+                                    HorizontalOptions="StartAndExpand" />
+                                <Label
+                                    Text="{Binding Send.File.SizeName, Mode=OneWay}"
+                                    StyleClass="box-sub-label"
+                                    HorizontalTextAlignment="End"
+                                    VerticalTextAlignment="Center" />
+                            </StackLayout>
+                            <StackLayout
+                                IsVisible="{Binding EditMode, Converter={StaticResource inverseBool}}"
+                                StyleClass="box-row">
+                                <Label
+                                    IsVisible="{Binding FileName, Converter={StaticResource null}}"
+                                    Text="{u:I18n NoFileChosen}"
+                                    LineBreakMode="CharacterWrap"
+                                    StyleClass="text-sm, text-muted"
+                                    HorizontalOptions="FillAndExpand"
+                                    HorizontalTextAlignment="Center" />
+                                <Label
+                                    IsVisible="{Binding FileName, Converter={StaticResource notNull}}"
+                                    Text="{Binding FileName}"
+                                    LineBreakMode="CharacterWrap"
+                                    StyleClass="text-sm, text-muted"
+                                    HorizontalOptions="FillAndExpand"
+                                    HorizontalTextAlignment="Center" />
+                                <Button
+                                    Text="{u:I18n ChooseFile}"
+                                    IsVisible="{Binding IsAddFromShare, Converter={StaticResource inverseBool}}"
+                                    IsEnabled="{Binding SendEnabled}"
+                                    StyleClass="box-button-row"
+                                    Clicked="ChooseFile_Clicked" />
+                                <Label
+                                    Margin="0, 5, 0, 0"
+                                    Text="{u:I18n MaxFileSize}"
+                                    StyleClass="text-sm, text-muted"
+                                    HorizontalOptions="FillAndExpand"
+                                    HorizontalTextAlignment="Center" />
+                            </StackLayout>
+                            <Label
+                                Text="{u:I18n TypeFileInfo}"
+                                IsVisible="{Binding ShowTypeButtons}"
+                                StyleClass="box-footer-label"
+                                Margin="0,5,0,0" />
+                        </StackLayout>
+                        <StackLayout
+                            StyleClass="box-row"
+                            IsVisible="{Binding IsText}">
+                            <Label
+                                Text="{u:I18n TypeText}"
+                                StyleClass="box-label" />
+                            <Editor
+                                x:Name="_textEditor"
+                                AutoSize="TextChanges"
+                                Text="{Binding Send.Text.Text}"
+                                IsEnabled="{Binding SendEnabled}"
+                                StyleClass="box-value"
+                                Margin="{Binding EditorMargins}" />
+                            <BoxView
+                                StyleClass="box-row-separator"
+                                IsVisible="{Binding ShowEditorSeparators}" />
+                            <Label
+                                Text="{u:I18n TypeTextInfo}"
+                                StyleClass="box-footer-label"
+                                Margin="0,5,0,10" />
+                            <StackLayout
+                                StyleClass="box-row, box-row-switch"
+                                Margin="0,10,0,0">
+                                <Label
+                                    Text="{u:I18n HideTextByDefault}"
+                                    StyleClass="box-label-regular"
+                                    VerticalOptions="Center"
+                                    HorizontalOptions="StartAndExpand" />
+                                <Switch
+                                    IsToggled="{Binding Send.Text.Hidden}"
+                                    IsEnabled="{Binding SendEnabled}"
+                                    HorizontalOptions="End"
+                                    Margin="10,0,0,0" />
+                            </StackLayout>
+                        </StackLayout>
+                        <StackLayout StyleClass="box-row, box-row-switch">
+                            <Label
+                                Text="{u:I18n ShareOnSave}"
+                                StyleClass="box-label-regular"
+                                VerticalOptions="Center"
+                                HorizontalOptions="StartAndExpand" />
+                            <Switch
+                                IsToggled="{Binding ShareOnSave}"
+                                IsEnabled="{Binding SendEnabled}"
+                                HorizontalOptions="End"
+                                Margin="10,0,0,0" />
+                        </StackLayout>
+                        <StackLayout
+                            Orientation="Horizontal"
+                            Spacing="0">
+                            <Button
+                                Text="{u:I18n Options}"
+                                x:Name="_btnOptions"
+                                StyleClass="box-row-button"
+                                TextColor="{StaticResource PrimaryColor}"
+                                Margin="0" />
+                            <controls:FaButton
+                                x:Name="_btnOptionsUp"
+                                Text="&#xf077;"
+                                StyleClass="box-row-button"
+                                TextColor="{StaticResource PrimaryColor}"
+                                Clicked="ToggleOptions_Clicked"
+                                IsVisible="False" />
+                            <controls:FaButton
+                                x:Name="_btnOptionsDown"
+                                Text="&#xf078;"
+                                StyleClass="box-row-button"
+                                TextColor="{StaticResource PrimaryColor}"
+                                Clicked="ToggleOptions_Clicked"
+                                IsVisible="False" />
+                        </StackLayout>
+                        <StackLayout IsVisible="True">
+                            <StackLayout
+                                StyleClass="box-row"
+                                Margin="0,10,0,0">
+                                <Label
+                                    Text="{u:I18n DeletionDate}"
+                                    StyleClass="box-label" />
+                                <Picker
+                                    x:Name="_deletionDateTypePicker"
+                                    IsVisible="{Binding EditMode, Converter={StaticResource inverseBool}}"
+                                    ItemsSource="{Binding DeletionTypeOptions, Mode=OneTime}"
+                                    SelectedIndex="{Binding DeletionDateTypeSelectedIndex}"
+                                    IsEnabled="{Binding SendEnabled}"
+                                    StyleClass="box-value"
+                                    AutomationProperties.IsInAccessibleTree="True"
+                                    AutomationProperties.Name="{u:I18n DeletionTime}" />
+                                <Grid
+                                    IsVisible="{Binding ShowDeletionCustomPickers}"
+                                    Margin="0,5,0,0">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <controls:ExtendedDatePicker
+                                        NullableDate="{Binding DeletionDate, Mode=TwoWay}"
+                                        Format="d"
+                                        IsEnabled="{Binding SendEnabled}"
+                                        AutomationProperties.IsInAccessibleTree="True"
+                                        AutomationProperties.Name="{u:I18n DeletionDate}"
+                                        Grid.Column="0" />
+                                    <controls:ExtendedTimePicker
+                                        NullableTime="{Binding DeletionTime, Mode=TwoWay}"
+                                        Format="t"
+                                        IsEnabled="{Binding SendEnabled}"
+                                        AutomationProperties.IsInAccessibleTree="True"
+                                        AutomationProperties.Name="{u:I18n DeletionTime}"
+                                        Grid.Column="1" />
+                                </Grid>
+                                <Label
+                                    Text="{u:I18n DeletionDateInfo}"
+                                    StyleClass="box-footer-label"
+                                    Margin="0,5,0,0" />
+                            </StackLayout>
+                            <StackLayout StyleClass="box-row" Margin="0,5,0,0">
+                                <Label
+                                    Text="{u:I18n ExpirationDate}"
+                                    StyleClass="box-label" />
+                                <Picker
+                                    x:Name="_expirationDateTypePicker"
+                                    IsVisible="{Binding EditMode, Converter={StaticResource inverseBool}}"
+                                    ItemsSource="{Binding ExpirationTypeOptions, Mode=OneTime}"
+                                    SelectedIndex="{Binding ExpirationDateTypeSelectedIndex}"
+                                    IsEnabled="{Binding SendEnabled}"
+                                    StyleClass="box-value"
+                                    AutomationProperties.IsInAccessibleTree="True"
+                                    AutomationProperties.Name="{u:I18n ExpirationTime}" />
+                                <Grid
+                                    IsVisible="{Binding ShowExpirationCustomPickers}"
+                                    Margin="0,5,0,0">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <controls:ExtendedDatePicker
+                                        NullableDate="{Binding ExpirationDate, Mode=TwoWay}"
+                                        PlaceHolder="mm/dd/yyyy"
+                                        Format="d"
+                                        IsEnabled="{Binding SendEnabled}"
+                                        AutomationProperties.IsInAccessibleTree="True"
+                                        AutomationProperties.Name="{u:I18n ExpirationDate}"
+                                        Grid.Column="0" />
+                                    <controls:ExtendedTimePicker
+                                        NullableTime="{Binding ExpirationTime, Mode=TwoWay}"
+                                        PlaceHolder="--:-- --"
+                                        Format="t"
+                                        IsEnabled="{Binding SendEnabled}"
+                                        AutomationProperties.IsInAccessibleTree="True"
+                                        AutomationProperties.Name="{u:I18n ExpirationTime}"
+                                        Grid.Column="1" />
+                                </Grid>
+                                <StackLayout
+                                    Orientation="Horizontal"
+                                    Margin="0,5,0,0">
+                                    <Label
+                                        Text="{u:I18n ExpirationDateInfo}"
+                                        StyleClass="box-footer-label"
+                                        HorizontalOptions="StartAndExpand" />
+                                    <Button
+                                        Text="{u:I18n Clear}"
+                                        IsVisible="{Binding EditMode}"
+                                        WidthRequest="110"
+                                        HeightRequest="{Binding SegmentedButtonHeight}"
+                                        FontSize="{Binding SegmentedButtonFontSize}"
+                                        IsEnabled="{Binding SendEnabled}"
+                                        StyleClass="box-row-button"
+                                        Clicked="ClearExpirationDate_Clicked" />
+                                </StackLayout>
+                            </StackLayout>
+                            <StackLayout
+                                StyleClass="box-row"
+                                Margin="0,5,0,0">
+                                <Label
+                                    Text="{u:I18n MaximumAccessCount}"
+                                    StyleClass="box-label" />
+                                <StackLayout
+                                    StyleClass="box-row"
+                                    Orientation="Horizontal">
+                                    <Entry
+                                        Text="{Binding MaxAccessCount}"
+                                        IsEnabled="{Binding SendEnabled}"
+                                        StyleClass="box-value"
+                                        Keyboard="Numeric"
+                                        MaxLength="9"
+                                        TextChanged="OnMaxAccessCountTextChanged"
+                                        HorizontalOptions="FillAndExpand" />
+                                    <Stepper
+                                        x:Name="_maxAccessCountStepper"
+                                        Value="{Binding MaxAccessCount}"
+                                        Maximum="999999999"
+                                        IsEnabled="{Binding SendEnabled}"
+                                        Margin="10,0,0,0" />
+                                </StackLayout>
+                                <Label
+                                    Text="{u:I18n MaximumAccessCountInfo}"
+                                    StyleClass="box-footer-label" />
+                                <StackLayout
+                                    IsVisible="{Binding EditMode}"
+                                    StyleClass="box-row"
+                                    Orientation="Horizontal">
+                                    <Label
+                                        Text="{u:I18n CurrentAccessCount}"
+                                        StyleClass="box-footer-label"
+                                        VerticalTextAlignment="Center" />
+                                    <Label
+                                        Text=": "
+                                        StyleClass="box-footer-label"
+                                        VerticalTextAlignment="Center" />
+                                    <Label
+                                        Text="{Binding Send.AccessCount, Mode=OneWay}"
+                                        StyleClass="box-label"
+                                        VerticalTextAlignment="Center" />
+                                </StackLayout>
+                            </StackLayout>
+                            <StackLayout
+                                StyleClass="box-row"
+                                Margin="0,5,0,0">
+                                <Label
+                                    Text="{u:I18n NewPassword}"
+                                    StyleClass="box-label" />
+                                <StackLayout Orientation="Horizontal">
+                                    <Entry
+                                        Text="{Binding NewPassword}"
+                                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
+                                        IsEnabled="{Binding SendEnabled}"
+                                        StyleClass="box-value"
+                                        IsSpellCheckEnabled="False"
+                                        IsTextPredictionEnabled="False"
+                                        HorizontalOptions="FillAndExpand" />
+                                    <controls:FaButton
+                                        IsEnabled="{Binding SendEnabled}"
+                                        StyleClass="box-row-button, box-row-button-platform"
+                                        Text="{Binding ShowPasswordIcon}"
+                                        Command="{Binding TogglePasswordCommand}"
+                                        Margin="10,0,0,0"
+                                        AutomationProperties.IsInAccessibleTree="True"
+                                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
+                                </StackLayout>
+                                <Label
+                                    Text="{u:I18n PasswordInfo}"
+                                    StyleClass="box-footer-label"
+                                    Margin="0,5,0,0" />
+                            </StackLayout>
+                            <StackLayout
+                                StyleClass="box-row"
+                                Margin="0,5,0,0">
+                                <Label
+                                    Text="{u:I18n Notes}"
+                                    StyleClass="box-label" />
+                                <Editor
+                                    AutoSize="TextChanges"
+                                    Text="{Binding Send.Notes}"
+                                    IsEnabled="{Binding SendEnabled}"
+                                    StyleClass="box-value"
+                                    Margin="{Binding EditorMargins}" />
+                                <BoxView
+                                    StyleClass="box-row-separator"
+                                    IsVisible="{Binding ShowEditorSeparators}" />
+                                <Label
+                                    Text="{u:I18n NotesInfo}"
+                                    StyleClass="box-footer-label"
+                                    Margin="0,5,0,0" />
+                            </StackLayout>
+                            <StackLayout
+                                StyleClass="box-row, box-row-switch"
+                                Margin="0,5,0,0">
+                                <Label
+                                    Text="{u:I18n HideEmail}"
+                                    StyleClass="box-label-regular"
+                                    VerticalOptions="Center"
+                                    HorizontalOptions="StartAndExpand" />
+                                <Switch
+                                    IsToggled="{Binding Send.HideEmail}"
+                                    IsEnabled="{Binding DisableHideEmailControl, Converter={StaticResource inverseBool}}"
+                                    HorizontalOptions="End"
+                                    Margin="10,0,0,0" />
+                            </StackLayout>
+                            <StackLayout
+                                StyleClass="box-row, box-row-switch"
+                                Margin="0,5,0,0">
+                                <Label
+                                    Text="{u:I18n DisableSend}"
+                                    StyleClass="box-label-regular"
+                                    VerticalOptions="Center"
+                                    HorizontalOptions="StartAndExpand" />
+                                <Switch
+                                    IsToggled="{Binding Send.Disabled}"
+                                    IsEnabled="{Binding SendEnabled}"
+                                    HorizontalOptions="End"
+                                    Margin="10,0,0,0" />
+                            </StackLayout>
+                        </StackLayout>
+
+                    </StackLayout>
+                </StackLayout>
+            </ScrollView>
+
+        </ResourceDictionary>
+    </ContentPage.Resources>
+
+</pages:BaseContentPage>

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

@@ -0,0 +1,329 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+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 Xamarin.Forms;
+using Xamarin.Forms.PlatformConfiguration;
+using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
+using Entry = Xamarin.Forms.Entry;
+
+namespace Bit.App.Pages
+{
+    public partial class SendAddEditPage : BaseContentPage
+    {
+        private readonly IBroadcasterService _broadcasterService;
+        private readonly IVaultTimeoutService _vaultTimeoutService;
+
+        private AppOptions _appOptions;
+        private SendAddEditPageViewModel _vm;
+
+        public SendAddEditPage(
+            AppOptions appOptions = null,
+            string sendId = null,
+            SendType? type = null)
+        {
+            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
+            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
+            _appOptions = appOptions;
+            InitializeComponent();
+            _vm = BindingContext as SendAddEditPageViewModel;
+            _vm.Page = this;
+            _vm.SendId = sendId;
+            _vm.Type = appOptions?.CreateSend?.Item1 ?? type;
+            SetActivityIndicator();
+            if (Device.RuntimePlatform == Device.Android)
+            {
+                if (_vm.EditMode)
+                {
+                    ToolbarItems.Add(_removePassword);
+                    ToolbarItems.Add(_copyLink);
+                    ToolbarItems.Add(_shareLink);
+                    ToolbarItems.Add(_deleteItem);
+                }
+                _vm.SegmentedButtonHeight = 36;
+                _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;
+            }
+            else if (Device.RuntimePlatform == Device.iOS)
+            {
+                ToolbarItems.Add(_closeItem);
+                if (_vm.EditMode)
+                {
+                    ToolbarItems.Add(_moreItem);
+                }
+                _vm.SegmentedButtonHeight = 30;
+                _vm.SegmentedButtonFontSize = 15;
+                _vm.SegmentedButtonMargins = new Thickness(0, 5, 0, 0);
+                _vm.ShowEditorSeparators = true;
+                _vm.EditorMargins = new Thickness(0, 10, 0, 5);
+                _deletionDateTypePicker.On<iOS>().SetUpdateMode(UpdateMode.WhenFinished);
+                _expirationDateTypePicker.On<iOS>().SetUpdateMode(UpdateMode.WhenFinished);
+            }
+
+            _deletionDateTypePicker.ItemDisplayBinding = new Binding("Key");
+            _expirationDateTypePicker.ItemDisplayBinding = new Binding("Key");
+
+            if (_vm.IsText)
+            {
+                _nameEntry.ReturnType = ReturnType.Next;
+                _nameEntry.ReturnCommand = new Command(() => _textEditor.Focus());
+            }
+        }
+
+        protected override async void OnAppearing()
+        {
+            base.OnAppearing();
+            if (!await AppHelpers.IsVaultTimeoutImmediateAsync())
+            {
+                await _vaultTimeoutService.CheckVaultTimeoutAsync();
+            }
+            if (await _vaultTimeoutService.IsLockedAsync())
+            {
+                return;
+            }
+            await _vm.InitAsync();
+            _broadcasterService.Subscribe(nameof(SendAddEditPage), message =>
+            {
+                if (message.Command == "selectFileResult")
+                {
+                    Device.BeginInvokeOnMainThread(() =>
+                    {
+                        var data = message.Data as Tuple<byte[], string>;
+                        _vm.FileData = data.Item1;
+                        _vm.FileName = data.Item2;
+                    });
+                }
+            });
+            await LoadOnAppearedAsync(_scrollView, true, async () =>
+            {
+                var success = await _vm.LoadAsync();
+                if (!success)
+                {
+                    await Navigation.PopModalAsync();
+                    return;
+                }
+                await HandleCreateRequest();
+                if (!_vm.EditMode && string.IsNullOrWhiteSpace(_vm.Send?.Name))
+                {
+                    RequestFocus(_nameEntry);
+                }
+                AdjustToolbar();
+            });
+        }
+
+        protected override bool OnBackButtonPressed()
+        {
+            if (_vm.IsAddFromShare && Device.RuntimePlatform == Device.Android)
+            {
+                _appOptions.CreateSend = null;
+            }
+            return base.OnBackButtonPressed();
+        }
+
+        protected override void OnDisappearing()
+        {
+            base.OnDisappearing();
+            if (Device.RuntimePlatform != Device.iOS)
+            {
+                _broadcasterService.Unsubscribe(nameof(SendAddEditPage));
+            }
+        }
+
+        private async void TextType_Clicked(object sender, EventArgs eventArgs)
+        {
+            await _vm.TypeChangedAsync(SendType.Text);
+            _nameEntry.ReturnType = ReturnType.Next;
+            _nameEntry.ReturnCommand = new Command(() => _textEditor.Focus());
+            if (string.IsNullOrWhiteSpace(_vm.Send.Name))
+            {
+                RequestFocus(_nameEntry);
+            }
+        }
+
+        private async void FileType_Clicked(object sender, EventArgs eventArgs)
+        {
+            await _vm.TypeChangedAsync(SendType.File);
+            _nameEntry.ReturnType = ReturnType.Done;
+            _nameEntry.ReturnCommand = null;
+            if (string.IsNullOrWhiteSpace(_vm.Send.Name))
+            {
+                RequestFocus(_nameEntry);
+            }
+        }
+
+        private void OnMaxAccessCountTextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (string.IsNullOrWhiteSpace(e.NewTextValue))
+            {
+                _vm.MaxAccessCount = null;
+                _maxAccessCountStepper.Value = 0;
+                return;
+            }
+            // accept only digits
+            if (!int.TryParse(e.NewTextValue, out int _))
+            {
+                ((Entry)sender).Text = e.OldTextValue;
+            }
+        }
+
+        private async void ChooseFile_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                await _vm.ChooseFileAsync();
+            }
+        }
+
+        private void ToggleOptions_Clicked(object sender, EventArgs e)
+        {
+            _vm.ToggleOptions();
+        }
+
+        private void ClearExpirationDate_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                _vm.ClearExpirationDate();
+            }
+        }
+
+        private async void Save_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                await _vm.SubmitAsync();
+            }
+        }
+
+        private async void RemovePassword_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                await _vm.RemovePasswordAsync();
+            }
+        }
+
+        private async void CopyLink_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                await _vm.CopyLinkAsync();
+            }
+        }
+
+        private async void ShareLink_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                await _vm.ShareLinkAsync();
+            }
+        }
+
+        private async void Delete_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                if (await _vm.DeleteAsync())
+                {
+                    await Navigation.PopModalAsync();
+                }
+            }
+        }
+
+        private async void More_Clicked(object sender, EventArgs e)
+        {
+            if (!DoOnce())
+            {
+                return;
+            }
+            var options = new List<string>();
+            if (_vm.SendEnabled && _vm.EditMode)
+            {
+                if (_vm.Send.HasPassword)
+                {
+                    options.Add(AppResources.RemovePassword);
+                }
+                options.Add(AppResources.CopyLink);
+                options.Add(AppResources.ShareLink);
+            }
+
+            var selection = await DisplayActionSheet(AppResources.Options, AppResources.Cancel,
+                _vm.EditMode ? AppResources.Delete : null, options.ToArray());
+            if (selection == AppResources.RemovePassword)
+            {
+                await _vm.RemovePasswordAsync();
+            }
+            else if (selection == AppResources.CopyLink)
+            {
+                await _vm.CopyLinkAsync();
+            }
+            else if (selection == AppResources.ShareLink)
+            {
+                await _vm.ShareLinkAsync();
+            }
+            else if (selection == AppResources.Delete)
+            {
+                if (await _vm.DeleteAsync())
+                {
+                    await Navigation.PopModalAsync();
+                }
+            }
+        }
+
+        private async void Close_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
+
+        private void AdjustToolbar()
+        {
+            _saveItem.IsEnabled = _vm.SendEnabled;
+            if (!_vm.SendEnabled && _vm.EditMode && Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.Remove(_removePassword);
+                ToolbarItems.Remove(_copyLink);
+                ToolbarItems.Remove(_shareLink);
+            }
+        }
+
+        private async Task HandleCreateRequest()
+        {
+            if (_appOptions?.CreateSend == null)
+            {
+                return;
+            }
+
+            _vm.IsAddFromShare = true;
+            
+            var name = _appOptions.CreateSend.Item2;
+            _vm.Send.Name = name;
+            
+            var type = _appOptions.CreateSend.Item1;
+            if (type == SendType.File)
+            {
+                _vm.FileData = _appOptions.CreateSend.Item3;
+                _vm.FileName = name;
+                FileType_Clicked(null, null);
+            }
+            else
+            {
+                var text = _appOptions.CreateSend.Item4;
+                _vm.Send.Text.Text = text;
+                TextType_Clicked(null, null);
+            }
+            _appOptions.CreateSend = null;
+        }
+    }
+}

src/App/Pages/Send/SendAddEditPageViewModel.cs

@@ -0,0 +1,612 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+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.View;
+using Bit.Core.Utilities;
+using Xamarin.Essentials;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public class SendAddEditPageViewModel : BaseViewModel
+    {
+        private readonly IDeviceActionService _deviceActionService;
+        private readonly IPlatformUtilsService _platformUtilsService;
+        private readonly IMessagingService _messagingService;
+        private readonly IUserService _userService;
+        private readonly ISendService _sendService;
+        private bool _sendEnabled;
+        private bool _canAccessPremium;
+        private bool _emailVerified;
+        private SendView _send;
+        private string _fileName;
+        private bool _showOptions;
+        private bool _showPassword;
+        private int _deletionDateTypeSelectedIndex;
+        private int _expirationDateTypeSelectedIndex;
+        private DateTime _simpleDeletionDateTime;
+        private DateTime _deletionDate;
+        private TimeSpan _deletionTime;
+        private DateTime? _simpleExpirationDateTime;
+        private DateTime? _expirationDate;
+        private TimeSpan? _expirationTime;
+        private bool _isOverridingPickers;
+        private int? _maxAccessCount;
+        private string[] _additionalSendProperties = new []
+        {
+            nameof(IsText),
+            nameof(IsFile),
+        };
+        private bool _disableHideEmail;
+        private bool _sendOptionsPolicyInEffect;
+
+        public SendAddEditPageViewModel()
+        {
+            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
+            _sendService = ServiceContainer.Resolve<ISendService>("sendService");
+            TogglePasswordCommand = new Command(TogglePassword);
+
+            TypeOptions = new List<KeyValuePair<string, SendType>>
+            {
+                new KeyValuePair<string, SendType>(AppResources.TypeText, SendType.Text),
+                new KeyValuePair<string, SendType>(AppResources.TypeFile, SendType.File),
+            };
+            DeletionTypeOptions = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>(AppResources.OneHour, AppResources.OneHour),
+                new KeyValuePair<string, string>(AppResources.OneDay, AppResources.OneDay),
+                new KeyValuePair<string, string>(AppResources.TwoDays, AppResources.TwoDays),
+                new KeyValuePair<string, string>(AppResources.ThreeDays, AppResources.ThreeDays),
+                new KeyValuePair<string, string>(AppResources.SevenDays, AppResources.SevenDays),
+                new KeyValuePair<string, string>(AppResources.ThirtyDays, AppResources.ThirtyDays),
+                new KeyValuePair<string, string>(AppResources.Custom, AppResources.Custom),
+            };
+            ExpirationTypeOptions = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>(AppResources.Never, AppResources.Never),
+                new KeyValuePair<string, string>(AppResources.OneHour, AppResources.OneHour),
+                new KeyValuePair<string, string>(AppResources.OneDay, AppResources.OneDay),
+                new KeyValuePair<string, string>(AppResources.TwoDays, AppResources.TwoDays),
+                new KeyValuePair<string, string>(AppResources.ThreeDays, AppResources.ThreeDays),
+                new KeyValuePair<string, string>(AppResources.SevenDays, AppResources.SevenDays),
+                new KeyValuePair<string, string>(AppResources.ThirtyDays, AppResources.ThirtyDays),
+                new KeyValuePair<string, string>(AppResources.Custom, AppResources.Custom),
+            };
+        }
+
+        public Command TogglePasswordCommand { get; set; }
+        public string SendId { get; set; }
+        public int SegmentedButtonHeight { get; set; }
+        public int SegmentedButtonFontSize { get; set; }
+        public Thickness SegmentedButtonMargins { get; set; }
+        public bool ShowEditorSeparators { get; set; }
+        public Thickness EditorMargins { get; set; }
+        public SendType? Type { get; set; }
+        public byte[] FileData { get; set; }
+        public string NewPassword { get; set; }
+        public bool ShareOnSave { get; set; }
+        public bool DisableHideEmailControl { get; set; }
+        public bool IsAddFromShare { get; set; }
+        public List<KeyValuePair<string, SendType>> TypeOptions { get; }
+        public List<KeyValuePair<string, string>> DeletionTypeOptions { get; }
+        public List<KeyValuePair<string, string>> ExpirationTypeOptions { get; }
+        public bool SendEnabled
+        {
+            get => _sendEnabled;
+            set => SetProperty(ref _sendEnabled, value);
+        }
+        public int DeletionDateTypeSelectedIndex
+        {
+            get => _deletionDateTypeSelectedIndex;
+            set
+            {
+                if (SetProperty(ref _deletionDateTypeSelectedIndex, value))
+                {
+                    DeletionTypeChanged();
+                }
+            }
+        }
+        public DateTime DeletionDate
+        {
+            get => _deletionDate;
+            set => SetProperty(ref _deletionDate, value);
+        }
+        public TimeSpan DeletionTime
+        {
+            get => _deletionTime;
+            set => SetProperty(ref _deletionTime, value);
+        }
+        public bool ShowOptions
+        {
+            get => _showOptions;
+            set => SetProperty(ref _showOptions, value);
+        }
+        public int ExpirationDateTypeSelectedIndex
+        {
+            get => _expirationDateTypeSelectedIndex;
+            set
+            {
+                if (SetProperty(ref _expirationDateTypeSelectedIndex, value))
+                {
+                    ExpirationTypeChanged();
+                }
+            }
+        }
+        public DateTime? ExpirationDate
+        {
+            get => _expirationDate;
+            set
+            {
+                if (SetProperty(ref _expirationDate, value))
+                {
+                    ExpirationDateChanged();
+                }
+            }
+        }
+        public TimeSpan? ExpirationTime
+        {
+            get => _expirationTime;
+            set
+            {
+                if (SetProperty(ref _expirationTime, value))
+                {
+                    ExpirationTimeChanged();
+                }
+            }
+        }
+        public int? MaxAccessCount
+        {
+            get => _maxAccessCount;
+            set
+            {
+                if (SetProperty(ref _maxAccessCount, value))
+                {
+                    MaxAccessCountChanged();
+                }
+            }
+        }
+        public SendView Send
+        {
+            get => _send;
+            set => SetProperty(ref _send, value, additionalPropertyNames: _additionalSendProperties);
+        }
+        public string FileName
+        {
+            get => _fileName;
+            set
+            {
+                if (SetProperty(ref _fileName, value))
+                {
+                    Send.File.FileName = _fileName;
+                }
+            }
+        }
+        public bool ShowPassword
+        {
+            get => _showPassword;
+            set => SetProperty(ref _showPassword, value,
+                additionalPropertyNames: new []
+                {
+                    nameof(ShowPasswordIcon)
+                });
+        }
+        public bool DisableHideEmail
+        {
+            get => _disableHideEmail;
+            set => SetProperty(ref _disableHideEmail, value);
+        }
+        public bool SendOptionsPolicyInEffect
+        {
+            get => _sendOptionsPolicyInEffect;
+            set => SetProperty(ref _sendOptionsPolicyInEffect, value);
+        }
+        public bool ShowTypeButtons => !EditMode && !IsAddFromShare;
+        public bool EditMode => !string.IsNullOrWhiteSpace(SendId);
+        public bool IsText => Send?.Type == SendType.Text;
+        public bool IsFile => Send?.Type == SendType.File;
+        public bool ShowDeletionCustomPickers => EditMode || DeletionDateTypeSelectedIndex == 6;
+        public bool ShowExpirationCustomPickers => EditMode || ExpirationDateTypeSelectedIndex == 7;
+        public string ShowPasswordIcon => ShowPassword ? "" : "";
+
+        public async Task InitAsync()
+        {
+            PageTitle = EditMode ? AppResources.EditSend : AppResources.AddSend;
+            _canAccessPremium = await _userService.CanAccessPremiumAsync();
+            _emailVerified = await _userService.GetEmailVerifiedAsync();
+            SendEnabled = ! await AppHelpers.IsSendDisabledByPolicyAsync();
+            DisableHideEmail = await AppHelpers.IsHideEmailDisabledByPolicyAsync();
+            SendOptionsPolicyInEffect = SendEnabled && DisableHideEmail;
+        }
+
+        public async Task<bool> LoadAsync()
+        {
+            if (Send == null)
+            {
+                _isOverridingPickers = true;
+                if (EditMode)
+                {
+                    var send = await _sendService.GetAsync(SendId);
+                    if (send == null)
+                    {
+                        return false;
+                    }
+                    Send = await send.DecryptAsync();
+                    DeletionDate = Send.DeletionDate.ToLocalTime();
+                    DeletionTime = DeletionDate.TimeOfDay;
+                    ExpirationDate = Send.ExpirationDate?.ToLocalTime();
+                    ExpirationTime = ExpirationDate?.TimeOfDay;
+                }
+                else
+                {
+                    var defaultType = _canAccessPremium && _emailVerified ? SendType.File : SendType.Text;
+                    Send = new SendView
+                    {
+                        Type = Type.GetValueOrDefault(defaultType),
+                    };
+                    _deletionDate = DateTimeNow().AddDays(7);
+                    _deletionTime = DeletionDate.TimeOfDay;
+                    DeletionDateTypeSelectedIndex = 4;
+                    ExpirationDateTypeSelectedIndex = 0;
+                }
+
+                MaxAccessCount = Send.MaxAccessCount;
+                _isOverridingPickers = false;
+            }
+
+            DisableHideEmailControl = !SendEnabled ||
+                (!EditMode && DisableHideEmail) ||
+                (EditMode && DisableHideEmail && !Send.HideEmail);
+
+            return true;
+        }
+
+        public async Task ChooseFileAsync()
+        {
+            await _deviceActionService.SelectFileAsync();
+        }
+
+        public void ClearExpirationDate()
+        {
+            _isOverridingPickers = true;
+            ExpirationDate = null;
+            ExpirationTime = null;
+            _isOverridingPickers = false;
+        }
+
+        private void UpdateSendData()
+        {
+            // filename
+            if (Send.File != null && FileName != null)
+            {
+                Send.File.FileName = FileName;
+            }
+
+            // deletion date
+            if (ShowDeletionCustomPickers)
+            {
+                Send.DeletionDate = DeletionDate.Date.Add(DeletionTime).ToUniversalTime();
+            }
+            else
+            {
+                Send.DeletionDate = _simpleDeletionDateTime.ToUniversalTime();
+            }
+
+            // expiration date
+            if (ShowExpirationCustomPickers && ExpirationDate.HasValue && ExpirationTime.HasValue)
+            {
+                Send.ExpirationDate = ExpirationDate.Value.Date.Add(ExpirationTime.Value).ToUniversalTime();
+            }
+            else if (_simpleExpirationDateTime.HasValue)
+            {
+                Send.ExpirationDate = _simpleExpirationDateTime.Value.ToUniversalTime();
+            }
+            else
+            {
+                Send.ExpirationDate = null;
+            }
+        }
+
+        public async Task<bool> SubmitAsync()
+        {
+            if (Send == null || !SendEnabled)
+            {
+                return false;
+            }
+            if (Connectivity.NetworkAccess == NetworkAccess.None)
+            {
+                await _platformUtilsService.ShowDialogAsync(AppResources.InternetConnectionRequiredMessage,
+                    AppResources.InternetConnectionRequiredTitle);
+                return false;
+            }
+            if (string.IsNullOrWhiteSpace(Send.Name))
+            {
+                await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
+                    string.Format(AppResources.ValidationFieldRequired, AppResources.Name),
+                    AppResources.Ok);
+                return false;
+            }
+            if (IsFile)
+            {
+                if (!_canAccessPremium)
+                {
+                    await _platformUtilsService.ShowDialogAsync(AppResources.SendFilePremiumRequired);
+                    return false;
+                }
+                if (!_emailVerified)
+                {
+                    await _platformUtilsService.ShowDialogAsync(AppResources.SendFileEmailVerificationRequired);
+                    return false;
+                }
+                if (!EditMode)
+                {
+                    if (FileData == null)
+                    {
+                        await _platformUtilsService.ShowDialogAsync(
+                            string.Format(AppResources.ValidationFieldRequired, AppResources.File),
+                            AppResources.AnErrorHasOccurred);
+                        return false;
+                    }
+                    if (FileData.Length > 104857600) // 100 MB
+                    {
+                        await _platformUtilsService.ShowDialogAsync(AppResources.MaxFileSize,
+                            AppResources.AnErrorHasOccurred);
+                        return false;
+                    }
+                }
+            }
+
+            UpdateSendData();
+
+            if (string.IsNullOrWhiteSpace(NewPassword)) 
+            {
+                NewPassword = null;
+            }
+
+            var (send, encryptedFileData) = await _sendService.EncryptAsync(Send, FileData, NewPassword);
+            if (send == null)
+            {
+                return false;
+            }
+            try
+            {
+                await _deviceActionService.ShowLoadingAsync(AppResources.Saving);
+                var sendId = await _sendService.SaveWithServerAsync(send, encryptedFileData);
+                await _deviceActionService.HideLoadingAsync();
+
+                if (Device.RuntimePlatform == Device.Android && IsFile)
+                {
+                    // Workaround for https://github.com/xamarin/Xamarin.Forms/issues/5418
+                    // Exiting and returning (file picker) calls OnAppearing on list page instead of this modal, and
+                    // it doesn't get called again when the model is dismissed, so the list isn't updated.
+                    _messagingService.Send("sendUpdated");
+                }
+
+                if (!ShareOnSave)
+                {
+                    _platformUtilsService.ShowToast("success", null,
+                    EditMode ? AppResources.SendUpdated : AppResources.NewSendCreated);
+                }
+
+                if (IsAddFromShare && Device.RuntimePlatform == Device.Android)
+                {
+                    _deviceActionService.CloseMainApp();
+                }
+                else
+                {
+                    await Page.Navigation.PopModalAsync();
+                }
+                
+                if (ShareOnSave)
+                {
+                    var savedSend = await _sendService.GetAsync(sendId);
+                    if (savedSend != null)
+                    {
+                        var savedSendView = await savedSend.DecryptAsync();
+                        await AppHelpers.ShareSendUrlAsync(savedSendView);
+                    }
+                }
+                
+                return true;
+            }
+            catch (ApiException e)
+            {
+                await _deviceActionService.HideLoadingAsync();
+                if (e?.Error != null)
+                {
+                    await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                        AppResources.AnErrorHasOccurred);
+                }
+            }
+            return false;
+        }
+
+        public async Task<bool> RemovePasswordAsync()
+        {
+            return await AppHelpers.RemoveSendPasswordAsync(SendId);
+        }
+
+        public async Task CopyLinkAsync()
+        {
+            await AppHelpers.CopySendUrlAsync(Send);
+        }
+
+        public async Task ShareLinkAsync()
+        {
+            await AppHelpers.ShareSendUrlAsync(Send);
+        }
+
+        public async Task<bool> DeleteAsync()
+        {
+            return await AppHelpers.DeleteSendAsync(SendId);
+        }
+
+        public async Task TypeChangedAsync(SendType type)
+        {
+            if (!SendEnabled)
+            {
+                await _platformUtilsService.ShowDialogAsync(AppResources.SendDisabledWarning);
+                if (IsAddFromShare && Device.RuntimePlatform == Device.Android)
+                {
+                    _deviceActionService.CloseMainApp();
+                }
+                else
+                {
+                    await Page.Navigation.PopModalAsync();
+                }
+                return;
+            }
+            if (Send != null)
+            {
+                if (!EditMode && type == SendType.File && (!_canAccessPremium || !_emailVerified))
+                {
+                    if (!_canAccessPremium)
+                    {
+                        await _platformUtilsService.ShowDialogAsync(AppResources.SendFilePremiumRequired);
+                    }
+                    else if (!_emailVerified)
+                    {
+                        await _platformUtilsService.ShowDialogAsync(AppResources.SendFileEmailVerificationRequired);
+                    }
+                    
+                    if (IsAddFromShare && Device.RuntimePlatform == Device.Android)
+                    {
+                        _deviceActionService.CloseMainApp();
+                        return;
+                    }
+                    type = SendType.Text;
+                }
+                Send.Type = type;
+                TriggerPropertyChanged(nameof(Send), _additionalSendProperties);
+            }
+        }
+
+        public void ToggleOptions()
+        {
+            ShowOptions = !ShowOptions;
+        }
+
+        private void DeletionTypeChanged()
+        {
+            if (Send != null && DeletionDateTypeSelectedIndex > -1)
+            {
+                _isOverridingPickers = true;
+                switch (DeletionDateTypeSelectedIndex)
+                {
+                    case 0:
+                        _simpleDeletionDateTime = DateTimeNow().AddHours(1);
+                        break;
+                    case 1:
+                        _simpleDeletionDateTime = DateTimeNow().AddDays(1);
+                        break;
+                    case 2:
+                        _simpleDeletionDateTime = DateTimeNow().AddDays(2);
+                        break;
+                    case 3:
+                        _simpleDeletionDateTime = DateTimeNow().AddDays(3);
+                        break;
+                    case 4:
+                        _simpleDeletionDateTime = DateTimeNow().AddDays(7);
+                        break;
+                    case 5:
+                        _simpleDeletionDateTime = DateTimeNow().AddDays(30);
+                        break;
+                    case 6:
+                        // custom option, initial values already set elsewhere
+                        break;
+                }
+                _isOverridingPickers = false;
+                TriggerPropertyChanged(nameof(ShowDeletionCustomPickers));
+            }
+        }
+
+        private void ExpirationTypeChanged()
+        {
+            if (Send != null && ExpirationDateTypeSelectedIndex > -1)
+            {
+                _isOverridingPickers = true;
+                switch (ExpirationDateTypeSelectedIndex)
+                {
+                    case 0:
+                        _simpleExpirationDateTime = null;
+                        break;
+                    case 1:
+                        _simpleExpirationDateTime = DateTimeNow().AddHours(1);
+                        break;
+                    case 2:
+                        _simpleExpirationDateTime = DateTimeNow().AddDays(1);
+                        break;
+                    case 3:
+                        _simpleExpirationDateTime = DateTimeNow().AddDays(2);
+                        break;
+                    case 4:
+                        _simpleExpirationDateTime = DateTimeNow().AddDays(3);
+                        break;
+                    case 5:
+                        _simpleExpirationDateTime = DateTimeNow().AddDays(7);
+                        break;
+                    case 6:
+                        _simpleExpirationDateTime = DateTimeNow().AddDays(30);
+                        break;
+                    case 7:
+                        // custom option, clear all expiration values
+                        _simpleExpirationDateTime = null;
+                        ClearExpirationDate();
+                        break;
+                }
+                _isOverridingPickers = false;
+                TriggerPropertyChanged(nameof(ShowExpirationCustomPickers));
+            }
+        }
+
+        private void ExpirationDateChanged()
+        {
+            if (!_isOverridingPickers && !ExpirationTime.HasValue)
+            {
+                // auto-set time to current time upon setting date
+                ExpirationTime = DateTimeNow().TimeOfDay;
+            }
+        }
+
+        private void ExpirationTimeChanged()
+        {
+            if (!_isOverridingPickers && !ExpirationDate.HasValue)
+            {
+                // auto-set date to current date upon setting time
+                ExpirationDate = DateTime.Today;
+            }
+        }
+
+        private void MaxAccessCountChanged()
+        {
+            Send.MaxAccessCount = _maxAccessCount;
+        }
+
+        private void TogglePassword()
+        {
+            ShowPassword = !ShowPassword;
+        }
+
+        private DateTime DateTimeNow()
+        {
+            var dtn = DateTime.Now;
+            return new DateTime(
+                dtn.Year,
+                dtn.Month,
+                dtn.Day,
+                dtn.Hour,
+                dtn.Minute,
+                0,
+                DateTimeKind.Local
+            );
+        }
+    }
+}

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

@@ -0,0 +1,172 @@
+<?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.SendGroupingsPage"
+    xmlns:pages="clr-namespace:Bit.App.Pages"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    xmlns:effects="clr-namespace:Bit.App.Effects"
+    xmlns:controls="clr-namespace:Bit.App.Controls"
+    x:DataType="pages:SendGroupingsPageViewModel"
+    Title="{Binding PageTitle}"
+    x:Name="_page">
+
+    <ContentPage.BindingContext>
+        <pages:SendGroupingsPageViewModel />
+    </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="sendTemplate"
+                          x:DataType="pages:SendGroupingsPageListItem">
+                <controls:SendViewCell
+                    Send="{Binding Send}"
+                    ButtonCommand="{Binding BindingContext.SendOptionsCommand, Source={x:Reference _page}}"
+                    ShowOptions="{Binding BindingContext.SendEnabled, Source={x:Reference _page}}" />
+            </DataTemplate>
+
+            <DataTemplate x:Key="sendGroupTemplate"
+                          x:DataType="pages:SendGroupingsPageListItem">
+                <controls:ExtendedStackLayout Orientation="Horizontal" 
+                                              StyleClass="list-row, list-row-platform">
+                    <controls:FaLabel Text="{Binding Icon, Mode=OneWay}"
+                                      HorizontalOptions="Start"
+                                      VerticalOptions="Center"
+                                      StyleClass="list-icon, list-icon-platform">
+                        <controls:FaLabel.Effects>
+                            <effects:FixedSizeEffect />
+                        </controls:FaLabel.Effects>
+                    </controls:FaLabel>
+                    <Label Text="{Binding Name, Mode=OneWay}"
+                           LineBreakMode="TailTruncation"
+                           HorizontalOptions="FillAndExpand"
+                           VerticalOptions="CenterAndExpand"
+                           StyleClass="list-title" />
+                    <Label Text="{Binding ItemCount, Mode=OneWay}"
+                           HorizontalOptions="End"
+                           VerticalOptions="CenterAndExpand"
+                           HorizontalTextAlignment="End"
+                           StyleClass="list-sub" />
+                </controls:ExtendedStackLayout>
+            </DataTemplate>
+
+            <pages:SendGroupingsPageListItemSelector x:Key="sendListItemDataTemplateSelector"
+                                                     SendTemplate="{StaticResource sendTemplate}"
+                                                     GroupTemplate="{StaticResource sendGroupTemplate}" />
+
+            <StackLayout x:Key="mainLayout" x:Name="_mainLayout">
+                <StackLayout 
+                    IsVisible="{Binding SendEnabled, Converter={StaticResource inverseBool}}"
+                    StyleClass="box">
+                    <Frame
+                        Padding="10"
+                        Margin="0, 12, 0, 6"
+                        HasShadow="False"
+                        BackgroundColor="Transparent"
+                        BorderColor="Accent">
+                        <Label
+                            Text="{u:I18n SendDisabledWarning}"
+                            StyleClass="text-muted, text-sm, text-bold"
+                            HorizontalTextAlignment="Center" />
+                    </Frame>
+                </StackLayout>
+                <StackLayout
+                    VerticalOptions="CenterAndExpand"
+                    Padding="20, 0"
+                    Spacing="20"
+                    IsVisible="{Binding ShowNoData}">
+                    <Label
+                        Text="{Binding NoDataText}"
+                        HorizontalTextAlignment="Center" />
+                    <Button
+                        Text="{u:I18n AddASend}"
+                        Clicked="AddButton_Clicked" />
+                </StackLayout>
+
+                <RefreshView
+                    IsVisible="{Binding ShowList}"
+                    IsRefreshing="{Binding Refreshing}"
+                    Command="{Binding RefreshCommand}">
+                    <controls:ExtendedCollectionView
+                        ItemsSource="{Binding GroupedSends}"
+                        VerticalOptions="FillAndExpand"
+                        ItemTemplate="{StaticResource sendListItemDataTemplateSelector}"
+                        IsGrouped="True"
+                        SelectionMode="Single"
+                        SelectionChanged="RowSelected"
+                        StyleClass="list, list-platform">
+
+                        <CollectionView.GroupHeaderTemplate>
+                            <DataTemplate x:DataType="pages:SendGroupingsPageListGroup">
+                                <StackLayout
+                                    Spacing="0" Padding="0" VerticalOptions="FillAndExpand"
+                                    StyleClass="list-row-header-container, list-row-header-container-platform">
+                                    <BoxView
+                                        StyleClass="list-section-separator-top, list-section-separator-top-platform"
+                                        IsVisible="{Binding First, Converter={StaticResource inverseBool}}" />
+                                    <StackLayout StyleClass="list-row-header, list-row-header-platform">
+                                        <Label
+                                            Text="{Binding Name}"
+                                            StyleClass="list-header, list-header-platform" />
+                                        <Label
+                                            Text="{Binding ItemCount}"
+                                            StyleClass="list-header-sub" />
+                                    </StackLayout>
+                                    <BoxView
+                                        StyleClass="list-section-separator-bottom, list-section-separator-bottom-platform" />
+                                </StackLayout>
+                            </DataTemplate>
+                        </CollectionView.GroupHeaderTemplate>
+                    </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"
+            IsVisible="{Binding SendEnabled}"
+            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/Send/SendGroupingsPage/SendGroupingsPage.xaml.cs

@@ -0,0 +1,198 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Bit.App.Controls;
+using Bit.App.Models;
+using Bit.Core.Abstractions;
+using Bit.Core.Enums;
+using Bit.Core.Utilities;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public partial class SendGroupingsPage : BaseContentPage
+    {
+        private readonly IBroadcasterService _broadcasterService;
+        private readonly ISyncService _syncService;
+        private readonly IVaultTimeoutService _vaultTimeoutService;
+        private readonly ISendService _sendService;
+        private readonly SendGroupingsPageViewModel _vm;
+        private readonly string _pageName;
+
+        private AppOptions _appOptions;
+
+        public SendGroupingsPage(bool mainPage, SendType? type = null, string pageTitle = null,
+            AppOptions appOptions = null)
+        {
+            _pageName = string.Concat(nameof(SendGroupingsPage), "_", DateTime.UtcNow.Ticks);
+            InitializeComponent();
+            SetActivityIndicator(_mainContent);
+            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
+            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
+            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
+            _sendService = ServiceContainer.Resolve<ISendService>("sendService");
+            _vm = BindingContext as SendGroupingsPageViewModel;
+            _vm.Page = this;
+            _vm.MainPage = mainPage;
+            _vm.Type = type;
+            _appOptions = appOptions;
+            if (pageTitle != null)
+            {
+                _vm.PageTitle = pageTitle;
+            }
+
+            if (Device.RuntimePlatform == Device.iOS)
+            {
+                _absLayout.Children.Remove(_fab);
+                if (type == null)
+                {
+                    ToolbarItems.Add(_aboutIconItem);
+                }
+                ToolbarItems.Add(_addItem);
+            }
+            else
+            {
+                ToolbarItems.Add(_syncItem);
+                ToolbarItems.Add(_lockItem);
+                ToolbarItems.Add(_aboutTextItem);
+            }
+        }
+
+        protected override async void OnAppearing()
+        {
+            base.OnAppearing();
+            await _vm.InitAsync();
+            if (_syncService.SyncInProgress)
+            {
+                IsBusy = true;
+            }
+
+            _broadcasterService.Subscribe(_pageName, async (message) =>
+            {
+                if (message.Command == "syncStarted")
+                {
+                    Device.BeginInvokeOnMainThread(() => IsBusy = true);
+                }
+                else if (message.Command == "syncCompleted" || message.Command == "sendUpdated")
+                {
+                    await Task.Delay(500);
+                    Device.BeginInvokeOnMainThread(() =>
+                    {
+                        IsBusy = false;
+                        if (_vm.LoadedOnce)
+                        {
+                            var task = _vm.LoadAsync();
+                        }
+                    });
+                }
+            });
+
+            await LoadOnAppearedAsync(_mainLayout, false, async () =>
+            {
+                if (!_syncService.SyncInProgress || (await _sendService.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);
+        }
+
+        protected override void OnDisappearing()
+        {
+            base.OnDisappearing();
+            IsBusy = false;
+            _broadcasterService.Unsubscribe(_pageName);
+            _vm.DisableRefreshing();
+        }
+
+        private async Task CheckAddRequest()
+        {
+            if (_appOptions?.CreateSend != null)
+            {
+                if (DoOnce())
+                {
+                    var page = new SendAddEditPage(_appOptions);
+                    await Navigation.PushModalAsync(new NavigationPage(page));
+                }
+            }
+        }
+        
+        private async void RowSelected(object sender, SelectionChangedEventArgs e)
+        {
+            ((ExtendedCollectionView)sender).SelectedItem = null;
+            if (!DoOnce())
+            {
+                return;
+            }
+            if (!(e.CurrentSelection?.FirstOrDefault() is SendGroupingsPageListItem item))
+            {
+                return;
+            }
+
+            if (item.Send != null)
+            {
+                await _vm.SelectSendAsync(item.Send);
+            }
+            else if (item.Type != null)
+            {
+                await _vm.SelectTypeAsync(item.Type.Value);
+            }
+        }
+
+        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), false);
+            }
+        }
+
+        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 void AdjustToolbar()
+        {
+            _addItem.IsEnabled = _vm.SendEnabled;
+        }
+    }
+}

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

@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+
+namespace Bit.App.Pages
+{
+    public class SendGroupingsPageListGroup : List<SendGroupingsPageListItem>
+    {
+        public SendGroupingsPageListGroup(string name, int count, bool doUpper = true, bool first = false)
+            : this(new List<SendGroupingsPageListItem>(), name, count, doUpper, first) { }
+
+        public SendGroupingsPageListGroup(List<SendGroupingsPageListItem> sendGroupItems, string name, int count,
+            bool doUpper = true, bool first = false)
+        {
+            AddRange(sendGroupItems);
+            if (string.IsNullOrWhiteSpace(name))
+            {
+                Name = "-";
+            }
+            else if (doUpper)
+            {
+                Name = name.ToUpperInvariant();
+            }
+            else
+            {
+                Name = name;
+            }
+            ItemCount = count > 0 ? count.ToString("N0") : "";
+            First = first;
+        }
+
+        public bool First { get; set; }
+        public string Name { get; set; }
+        public string NameShort => string.IsNullOrWhiteSpace(Name) || Name.Length == 0 ? "-" : Name[0].ToString();
+        public string ItemCount { get; set; }
+    }
+}

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

@@ -0,0 +1,69 @@
+using Bit.App.Resources;
+using Bit.Core.Enums;
+using Bit.Core.Models.View;
+
+namespace Bit.App.Pages
+{
+    public class SendGroupingsPageListItem
+    {
+        private string _icon;
+        private string _name;
+
+        public SendView Send { get; set; }
+        public SendType? Type { get; set; }
+        public string ItemCount { get; set; }
+        public bool ShowOptions { get; set; }
+
+        public string Name
+        {
+            get
+            {
+                if (_name != null)
+                {
+                    return _name;
+                }
+                if (Type != null)
+                {
+                    switch (Type.Value)
+                    {
+                        case SendType.Text:
+                            _name = AppResources.TypeText;
+                            break;
+                        case SendType.File:
+                            _name = AppResources.TypeFile;
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                return _name;
+            }
+        }
+
+        public string Icon
+        {
+            get
+            {
+                if (_icon != null)
+                {
+                    return _icon;
+                }
+                if (Type != null)
+                {
+                    switch (Type.Value)
+                    {
+                        case SendType.Text:
+                            _icon = "\uf0f6"; // fa-file-text-o
+                            break;
+                        case SendType.File:
+                            _icon = "\uf016"; // fa-file-o
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                return _icon;
+            }
+        }
+    }
+}

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

@@ -0,0 +1,19 @@
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public class SendGroupingsPageListItemSelector : DataTemplateSelector
+    {
+        public DataTemplate SendTemplate { get; set; }
+        public DataTemplate GroupTemplate { get; set; }
+
+        protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
+        {
+            if (item is SendGroupingsPageListItem listItem)
+            {
+                return listItem.Send != null ? SendTemplate : GroupTemplate;
+            }
+            return null;
+        }
+    }
+}

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

@@ -0,0 +1,303 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Bit.App.Abstractions;
+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.Essentials;
+using Xamarin.Forms;
+using DeviceType = Bit.Core.Enums.DeviceType;
+
+namespace Bit.App.Pages
+{
+    public class SendGroupingsPageViewModel : BaseViewModel
+    {
+        private bool _sendEnabled;
+        private bool _refreshing;
+        private bool _doingLoad;
+        private bool _loading;
+        private bool _loaded;
+        private bool _showNoData;
+        private bool _showList;
+        private bool _syncRefreshing;
+        private string _noDataText;
+        private List<SendView> _allSends;
+        private Dictionary<SendType, int> _typeCounts = new Dictionary<SendType, int>();
+
+        private readonly ISendService _sendService;
+        private readonly ISyncService _syncService;
+        private readonly IUserService _userService;
+        private readonly IVaultTimeoutService _vaultTimeoutService;
+        private readonly IDeviceActionService _deviceActionService;
+        private readonly IPlatformUtilsService _platformUtilsService;
+        private readonly IStorageService _storageService;
+
+        public SendGroupingsPageViewModel()
+        {
+            _sendService = ServiceContainer.Resolve<ISendService>("sendService");
+            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
+            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
+            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+
+            Loading = true;
+            PageTitle = AppResources.Send;
+            GroupedSends = new ExtendedObservableCollection<SendGroupingsPageListGroup>();
+            RefreshCommand = new Command(async () =>
+            {
+                Refreshing = true;
+                await LoadAsync();
+            });
+            SendOptionsCommand = new Command<SendView>(SendOptionsAsync);
+        }
+
+        public bool MainPage { get; set; }
+        public SendType? Type { get; set; }
+        public Func<SendView, bool> Filter { get; set; }
+        public bool HasSends { get; set; }
+        public List<SendView> Sends { get; set; }
+
+        public bool SendEnabled
+        {
+            get => _sendEnabled;
+            set => SetProperty(ref _sendEnabled, value);
+        }
+        public bool Refreshing
+        {
+            get => _refreshing;
+            set => SetProperty(ref _refreshing, value);
+        }
+        public bool SyncRefreshing
+        {
+            get => _syncRefreshing;
+            set => SetProperty(ref _syncRefreshing, value);
+        }
+        public bool Loading
+        {
+            get => _loading;
+            set => SetProperty(ref _loading, value);
+        }
+        public bool Loaded
+        {
+            get => _loaded;
+            set => SetProperty(ref _loaded, value);
+        }
+        public bool ShowNoData
+        {
+            get => _showNoData;
+            set => SetProperty(ref _showNoData, value);
+        }
+        public string NoDataText
+        {
+            get => _noDataText;
+            set => SetProperty(ref _noDataText, value);
+        }
+        public bool ShowList
+        {
+            get => _showList;
+            set => SetProperty(ref _showList, value);
+        }
+        public ExtendedObservableCollection<SendGroupingsPageListGroup> GroupedSends { get; set; }
+        public Command RefreshCommand { get; set; }
+        public Command<SendView> SendOptionsCommand { get; set; }
+        public bool LoadedOnce { get; set; }
+
+        public async Task InitAsync()
+        {
+            SendEnabled = ! await AppHelpers.IsSendDisabledByPolicyAsync();
+        }
+        
+        public async Task LoadAsync()
+        {
+            if (_doingLoad)
+            {
+                return;
+            }
+            var authed = await _userService.IsAuthenticatedAsync();
+            if (!authed)
+            {
+                return;
+            }
+            if (await _vaultTimeoutService.IsLockedAsync())
+            {
+                return;
+            }
+            if (await _storageService.GetAsync<bool>(Constants.SyncOnRefreshKey) && Refreshing && !SyncRefreshing)
+            {
+                SyncRefreshing = true;
+                await _syncService.FullSyncAsync(false);
+                return;
+            }
+
+            _doingLoad = true;
+            LoadedOnce = true;
+            ShowNoData = false;
+            Loading = true;
+            ShowList = false;
+            var groupedSends = new List<SendGroupingsPageListGroup>();
+            var page = Page as SendGroupingsPage;
+
+            try
+            {
+                await LoadDataAsync();
+
+                var uppercaseGroupNames = _deviceActionService.DeviceType == DeviceType.iOS;
+                if (MainPage)
+                {
+                    groupedSends.Add(new SendGroupingsPageListGroup(
+                        AppResources.Types, 0, uppercaseGroupNames, true)
+                    {
+                        new SendGroupingsPageListItem
+                        {
+                            Type = SendType.Text,
+                            ItemCount = (_typeCounts.ContainsKey(SendType.Text) ?
+                                _typeCounts[SendType.Text] : 0).ToString("N0")
+                        },
+                        new SendGroupingsPageListItem
+                        {
+                            Type = SendType.File,
+                            ItemCount = (_typeCounts.ContainsKey(SendType.File) ?
+                                _typeCounts[SendType.File] : 0).ToString("N0")
+                        },
+                    });
+                }
+
+                if (Sends?.Any() ?? false)
+                {
+                    var sendsListItems = Sends.Select(s => new SendGroupingsPageListItem
+                    {
+                        Send = s,
+                        ShowOptions = SendEnabled
+                    }).ToList();
+                    groupedSends.Add(new SendGroupingsPageListGroup(sendsListItems,
+                        MainPage ? AppResources.AllSends : AppResources.Sends, sendsListItems.Count,
+                        uppercaseGroupNames, !MainPage));
+                }
+                GroupedSends.ResetWithRange(groupedSends);
+            }
+            finally
+            {
+                _doingLoad = false;
+                Loaded = true;
+                Loading = false;
+                ShowNoData = (MainPage && !HasSends) || !groupedSends.Any();
+                ShowList = !ShowNoData;
+                DisableRefreshing();
+            }
+        }
+
+        public void DisableRefreshing()
+        {
+            Refreshing = false;
+            SyncRefreshing = false;
+        }
+
+        public async Task SelectSendAsync(SendView send)
+        {
+            var page = new SendAddEditPage(null, send.Id);
+            await Page.Navigation.PushModalAsync(new NavigationPage(page));
+        }
+
+        public async Task SelectTypeAsync(SendType type)
+        {
+            string title = null;
+            switch (type)
+            {
+                case SendType.Text:
+                    title = AppResources.TypeText;
+                    break;
+                case SendType.File:
+                    title = AppResources.TypeFile;
+                    break;
+                default:
+                    break;
+            }
+            var page = new SendGroupingsPage(false, type, title);
+            await Page.Navigation.PushAsync(page);
+        }
+
+        public async Task SyncAsync()
+        {
+            if (Connectivity.NetworkAccess == NetworkAccess.None)
+            {
+                await _platformUtilsService.ShowDialogAsync(AppResources.InternetConnectionRequiredMessage,
+                    AppResources.InternetConnectionRequiredTitle);
+                return;
+            }
+            await _deviceActionService.ShowLoadingAsync(AppResources.Syncing);
+            try
+            {
+                await _syncService.FullSyncAsync(false, true);
+                await _deviceActionService.HideLoadingAsync();
+                _platformUtilsService.ShowToast("success", null, AppResources.SyncingComplete);
+            }
+            catch
+            {
+                await _deviceActionService.HideLoadingAsync();
+                _platformUtilsService.ShowToast("error", null, AppResources.SyncingFailed);
+            }
+        }
+
+        public void ShowAbout()
+        {
+            _platformUtilsService.LaunchUri("https://bitwarden.com/products/send/");
+        }
+
+        private async Task LoadDataAsync()
+        {
+            NoDataText = AppResources.NoSends;
+            _allSends = await _sendService.GetAllDecryptedAsync();
+            HasSends = _allSends.Any();
+            _typeCounts.Clear();
+            Filter = null;
+
+            if (MainPage)
+            {
+                Sends = _allSends;
+                foreach (var c in _allSends)
+                {
+                    if (_typeCounts.ContainsKey(c.Type))
+                    {
+                        _typeCounts[c.Type] = _typeCounts[c.Type] + 1;
+                    }
+                    else
+                    {
+                        _typeCounts.Add(c.Type, 1);
+                    }
+                }
+            }
+            else
+            {
+                if (Type != null)
+                {
+                    Filter = c => c.Type == Type.Value;
+                }
+                else
+                {
+                    PageTitle = AppResources.AllSends;
+                }
+                Sends = Filter != null ? _allSends.Where(Filter).ToList() : _allSends;
+            }
+        }
+
+        private async void SendOptionsAsync(SendView send)
+        {
+            if ((Page as BaseContentPage).DoOnce())
+            {
+                var selection = await AppHelpers.SendListOptions(Page, send);
+                if (selection == AppResources.RemovePassword || selection == AppResources.Delete)
+                {
+                    await LoadAsync();
+                }
+            }
+        }
+    }
+}

src/App/Pages/Send/SendsPage.xaml

@@ -0,0 +1,81 @@
+<?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.SendsPage"
+    xmlns:pages="clr-namespace:Bit.App.Pages"
+    xmlns:controls="clr-namespace:Bit.App.Controls"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    xmlns:views="clr-namespace:Bit.Core.Models.View;assembly=BitwardenCore"
+    x:DataType="pages:SendsPageViewModel"
+    x:Name="_page"
+    Title="{Binding PageTitle}">
+
+    <ContentPage.BindingContext>
+        <pages:SendsPageViewModel />
+    </ContentPage.BindingContext>
+
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <u:DateTimeConverter x:Key="dateTime" />
+            <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
+                         x:Name="_closeItem" x:Key="closeItem" />
+            <StackLayout
+                Orientation="Horizontal"
+                VerticalOptions="FillAndExpand"
+                HorizontalOptions="FillAndExpand"
+                Spacing="0"
+                Padding="0"
+                x:Name="_titleLayout"
+                x:Key="titleLayout">
+                <controls:MiButton
+                    StyleClass="btn-title, btn-title-platform"
+                    Text="&#xe5c4;"
+                    VerticalOptions="CenterAndExpand"
+                    Clicked="BackButton_Clicked"
+                    x:Name="_backButton" />
+                <controls:ExtendedSearchBar
+                    x:Name="_searchBar"
+                    HorizontalOptions="FillAndExpand"
+                    TextChanged="SearchBar_TextChanged"
+                    SearchButtonPressed="SearchBar_SearchButtonPressed"
+                    Placeholder="{Binding PageTitle}" />
+            </StackLayout>
+            <BoxView StyleClass="list-section-separator-bottom, list-section-separator-bottom-platform"
+                     x:Name="_separator" x:Key="separator" />
+        </ResourceDictionary>
+    </ContentPage.Resources>
+
+    <StackLayout x:Name="_mainLayout" Spacing="0" Padding="0">
+        <controls:FaLabel IsVisible="{Binding ShowSearchDirection}"
+               Text="&#xf002;"
+               StyleClass="text-muted"
+               FontSize="50"
+               VerticalOptions="CenterAndExpand"
+               HorizontalOptions="CenterAndExpand"
+               HorizontalTextAlignment="Center" />
+        <Label IsVisible="{Binding ShowNoData}"
+               Text="{u:I18n NoItemsToList}"
+               Margin="20, 0"
+               VerticalOptions="CenterAndExpand"
+               HorizontalOptions="CenterAndExpand"
+               HorizontalTextAlignment="Center" />
+        <controls:ExtendedCollectionView
+               IsVisible="{Binding ShowList}"
+               ItemsSource="{Binding Sends}"
+               VerticalOptions="FillAndExpand"
+               SelectionMode="Single"
+               SelectionChanged="RowSelected"
+               StyleClass="list, list-platform">
+            <CollectionView.ItemTemplate>
+                <DataTemplate x:DataType="views:SendView">
+                    <controls:SendViewCell
+                        Send="{Binding .}"
+                        ButtonCommand="{Binding BindingContext.SendOptionsCommand, Source={x:Reference _page}}"
+                        ShowOptions="{Binding BindingContext.SendEnabled, Source={x:Reference _page}}" />
+                </DataTemplate>
+            </CollectionView.ItemTemplate>
+        </controls:ExtendedCollectionView>
+    </StackLayout>
+
+</pages:BaseContentPage>

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

@@ -0,0 +1,111 @@
+using System;
+using System.Linq;
+using Bit.App.Controls;
+using Bit.App.Resources;
+using Bit.Core.Models.View;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public partial class SendsPage : BaseContentPage
+    {
+        private SendsPageViewModel _vm;
+        private bool _hasFocused;
+
+        public SendsPage(Func<SendView, bool> filter, bool type = false)
+        {
+            InitializeComponent();
+            _vm = BindingContext as SendsPageViewModel;
+            _vm.Page = this;
+            _vm.Filter = filter;
+            if (type)
+            {
+                _vm.PageTitle = AppResources.SearchType;
+            }
+            else
+            {
+                _vm.PageTitle = AppResources.SearchSends;
+            }
+
+            if (Device.RuntimePlatform == Device.iOS)
+            {
+                ToolbarItems.Add(_closeItem);
+                _searchBar.Placeholder = AppResources.Search;
+                _mainLayout.Children.Insert(0, _searchBar);
+                _mainLayout.Children.Insert(1, _separator);
+            }
+            else
+            {
+                NavigationPage.SetTitleView(this, _titleLayout);
+            }
+        }
+
+        public SearchBar SearchBar => _searchBar;
+
+        protected async override void OnAppearing()
+        {
+            base.OnAppearing();
+            await _vm.InitAsync();
+            if (!_hasFocused)
+            {
+                _hasFocused = true;
+                RequestFocus(_searchBar);
+            }
+        }
+
+        private void SearchBar_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            var oldLength = e.OldTextValue?.Length ?? 0;
+            var newLength = e.NewTextValue?.Length ?? 0;
+            if (oldLength < 2 && newLength < 2 && oldLength < newLength)
+            {
+                return;
+            }
+            _vm.Search(e.NewTextValue, 200);
+        }
+
+        private void SearchBar_SearchButtonPressed(object sender, EventArgs e)
+        {
+            _vm.Search((sender as SearchBar).Text);
+        }
+
+        private void BackButton_Clicked(object sender, EventArgs e)
+        {
+            GoBack();
+        }
+
+        protected override bool OnBackButtonPressed()
+        {
+            GoBack();
+            return true;
+        }
+
+        private void GoBack()
+        {
+            if (!DoOnce())
+            {
+                return;
+            }
+            Navigation.PopModalAsync(false);
+        }
+
+        private async void RowSelected(object sender, SelectionChangedEventArgs e)
+        {
+            ((ExtendedCollectionView)sender).SelectedItem = null;
+            if (!DoOnce())
+            {
+                return;
+            }
+
+            if (e.CurrentSelection?.FirstOrDefault() is SendView send)
+            {
+                await _vm.SelectSendAsync(send);
+            }
+        }
+
+        private void Close_Clicked(object sender, EventArgs e)
+        {
+            GoBack();
+        }
+    }
+}

src/App/Pages/Send/SendsPageViewModel.cs

@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Bit.App.Utilities;
+using Bit.Core.Abstractions;
+using Bit.Core.Models.View;
+using Bit.Core.Utilities;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public class SendsPageViewModel : BaseViewModel
+    {
+        private readonly ISearchService _searchService;
+
+        private CancellationTokenSource _searchCancellationTokenSource;
+        private bool _sendEnabled;
+        private bool _showNoData;
+        private bool _showList;
+
+        public SendsPageViewModel()
+        {
+            _searchService = ServiceContainer.Resolve<ISearchService>("searchService");
+            Sends = new ExtendedObservableCollection<SendView>();
+            SendOptionsCommand = new Command<SendView>(SendOptionsAsync);
+        }
+
+        public Command SendOptionsCommand { get; set; }
+        public ExtendedObservableCollection<SendView> Sends { get; set; }
+        public Func<SendView, bool> Filter { get; set; }
+
+        public bool SendEnabled
+        {
+            get => _sendEnabled;
+            set => SetProperty(ref _sendEnabled, value);
+        }
+        
+        public bool ShowNoData
+        {
+            get => _showNoData;
+            set => SetProperty(ref _showNoData, value, additionalPropertyNames: new []
+            {
+                nameof(ShowSearchDirection)
+            });
+        }
+
+        public bool ShowList
+        {
+            get => _showList;
+            set => SetProperty(ref _showList, value, additionalPropertyNames: new []
+            {
+                nameof(ShowSearchDirection)
+            });
+        }
+
+        public bool ShowSearchDirection => !ShowList && !ShowNoData;
+
+        public async Task InitAsync()
+        {
+            SendEnabled = ! await AppHelpers.IsSendDisabledByPolicyAsync();
+            if (!string.IsNullOrWhiteSpace((Page as SendsPage).SearchBar.Text))
+            {
+                Search((Page as SendsPage).SearchBar.Text, 200);
+            }
+        }
+
+        public void Search(string searchText, int? timeout = null)
+        {
+            var previousCts = _searchCancellationTokenSource;
+            var cts = new CancellationTokenSource();
+            Task.Run(async () =>
+            {
+                List<SendView> sends = null;
+                var searchable = !string.IsNullOrWhiteSpace(searchText) && searchText.Length > 1;
+                if (searchable)
+                {
+                    if (timeout != null)
+                    {
+                        await Task.Delay(timeout.Value);
+                    }
+                    if (searchText != (Page as SendsPage).SearchBar.Text)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        previousCts?.Cancel();
+                    }
+                    try
+                    {
+                        sends = await _searchService.SearchSendsAsync(searchText, Filter, null, cts.Token);
+                        cts.Token.ThrowIfCancellationRequested();
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        return;
+                    }
+                }
+                if (sends == null)
+                {
+                    sends = new List<SendView>();
+                }
+                Device.BeginInvokeOnMainThread(() =>
+                {
+                    Sends.ResetWithRange(sends);
+                    ShowNoData = searchable && Sends.Count == 0;
+                    ShowList = searchable && !ShowNoData;
+                });
+            }, cts.Token);
+            _searchCancellationTokenSource = cts;
+        }
+
+        public async Task SelectSendAsync(SendView send)
+        {
+            var page = new SendAddEditPage(null, send.Id);
+            await Page.Navigation.PushModalAsync(new NavigationPage(page));
+        }
+
+        private async void SendOptionsAsync(SendView send)
+        {
+            if ((Page as BaseContentPage).DoOnce())
+            {
+                await AppHelpers.SendListOptions(Page, send);
+            }
+        }
+    }
+}

src/App/Pages/Settings/AutofillServicesPage.xaml

@@ -19,7 +19,7 @@
                 <StackLayout StyleClass="box-row, box-row-switch">
                     <Label
                         Text="{u:I18n AutofillService}"
-                        StyleClass="box-label, box-label-regular"
+                        StyleClass="box-label-regular"
                         HorizontalOptions="StartAndExpand" />
                     <RelativeLayout HorizontalOptions="End">
                         <Switch
@@ -46,7 +46,7 @@
                 <StackLayout StyleClass="box-row, box-row-switch">
                     <Label
                         Text="{u:I18n InlineAutofill}"
-                        StyleClass="box-label, box-label-regular"
+                        StyleClass="box-label-regular"
                         IsEnabled="{Binding InlineAutofillEnabled}"
                         HorizontalOptions="StartAndExpand" />
                     <RelativeLayout HorizontalOptions="End">
@@ -75,7 +75,7 @@
                 <StackLayout StyleClass="box-row, box-row-switch">
                     <Label
                         Text="{u:I18n Accessibility}"
-                        StyleClass="box-label, box-label-regular"
+                        StyleClass="box-label-regular"
                         HorizontalOptions="StartAndExpand" />
                     <RelativeLayout HorizontalOptions="End">
                         <Switch
@@ -102,7 +102,7 @@
                 <StackLayout StyleClass="box-row, box-row-switch">
                     <Label
                         Text="{u:I18n DrawOver}"
-                        StyleClass="box-label, box-label-regular"
+                        StyleClass="box-label-regular"
                         IsEnabled="{Binding DrawOverEnabled}"
                         HorizontalOptions="StartAndExpand" />
                     <RelativeLayout HorizontalOptions="End">

src/App/Pages/Settings/ExportVaultPage.xaml

@@ -21,7 +21,7 @@
     </ContentPage.Resources>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" />
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" />
     </ContentPage.ToolbarItems>
 
     <ScrollView>
@@ -35,6 +35,7 @@
                         x:Name="_fileFormatPicker"
                         ItemsSource="{Binding FileFormatOptions, Mode=OneTime}"
                         SelectedIndex="{Binding FileFormatSelectedIndex}"
+                        SelectedIndexChanged="FileFormat_Changed"
                         StyleClass="box-value" />
                 </StackLayout>
                 <Grid StyleClass="box-row">
@@ -75,19 +76,6 @@
                 <Label
                     Text="{u:I18n ExportVaultMasterPasswordDescription}"
                     StyleClass="box-footer-label, box-footer-label-switch" />
-                <Label
-                    StyleClass="box-footer-label, box-footer-label-switch"
-                    Margin="0, 20">
-                    <Label.FormattedText>
-                        <FormattedString>
-                            <Span
-                                Text="{Binding Converter={StaticResource toUpper}, ConverterParameter={u:I18n Warning}}"
-                                FontAttributes="Bold" />
-                            <Span Text=": " FontAttributes="Bold" />
-                            <Span Text="{u:I18n ExportVaultWarning}" />
-                        </FormattedString>
-                    </Label.FormattedText>
-                </Label>
                 <StackLayout Spacing="20">
                     <Button Text="{u:I18n ExportVault}"
                             Clicked="ExportVault_Clicked"

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

@@ -65,5 +65,10 @@ namespace Bit.App.Pages
                 await _vm.ExportVaultAsync();
             }
         }
+
+        void FileFormat_Changed(object sender, EventArgs e)
+        {
+            _vm?.UpdateWarning();
+        }
     }
 }

src/App/Pages/Settings/ExportVaultPageViewModel.cs

@@ -22,10 +22,12 @@ namespace Bit.App.Pages
         private readonly IExportService _exportService;
 
         private int _fileFormatSelectedIndex;
+        private string _exportWarningMessage;
         private bool _showPassword;
         private string _masterPassword;
         private byte[] _exportResult;
         private string _defaultFilename;
+        private bool _initialized = false;
 
         public ExportVaultPageViewModel()
         {
@@ -42,13 +44,16 @@ namespace Bit.App.Pages
             FileFormatOptions = new List<KeyValuePair<string, string>>
             {
                 new KeyValuePair<string, string>("json", ".json"),
-                new KeyValuePair<string, string>("csv", ".csv")
+                new KeyValuePair<string, string>("csv", ".csv"),
+                new KeyValuePair<string, string>("encrypted_json", ".json (Encrypted)")
             };
         }
 
         public async Task InitAsync()
         {
+            _initialized = true;
             FileFormatSelectedIndex = FileFormatOptions.FindIndex(k => k.Key == "json");
+            UpdateWarning();
         }
 
         public List<KeyValuePair<string, string>> FileFormatOptions { get; set; }
@@ -59,6 +64,12 @@ namespace Bit.App.Pages
             set { SetProperty(ref _fileFormatSelectedIndex, value); }
         }
 
+        public string ExportWarningMessage
+        {
+            get => _exportWarningMessage;
+            set { SetProperty(ref _exportWarningMessage, value); }
+        }
+
         public bool ShowPassword
         {
             get => _showPassword;
@@ -92,38 +103,45 @@ namespace Bit.App.Pages
                 return;
             }
 
-            var keyHash = await _cryptoService.HashPasswordAsync(_masterPassword, null);
+            var passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(_masterPassword, null);
             MasterPassword = string.Empty;
-            
-            var storedKeyHash = await _cryptoService.GetKeyHashAsync();
-            if (storedKeyHash != null && keyHash != null && storedKeyHash == keyHash)
+            if (!passwordValid)
             {
-                try
-                {
-                    var data = await _exportService.GetExport(FileFormatOptions[FileFormatSelectedIndex].Key);
-                    var fileFormat = FileFormatOptions[FileFormatSelectedIndex].Key;
-                    _defaultFilename = _exportService.GetFileName(null, fileFormat);
-                    _exportResult = Encoding.ASCII.GetBytes(data);
+                await _platformUtilsService.ShowDialogAsync(_i18nService.T("InvalidMasterPassword"));
+                return;
+            }
 
-                    if (!_deviceActionService.SaveFile(_exportResult, null, _defaultFilename, null))
-                    {
-                        ClearResult();
-                        await _platformUtilsService.ShowDialogAsync(_i18nService.T("ExportVaultFailure"));
-                    }
-                }
-                catch (Exception ex)
+            bool userConfirmedExport = await _platformUtilsService.ShowDialogAsync(ExportWarningMessage,
+                _i18nService.T("ExportVaultConfirmationTitle"), _i18nService.T("ExportVault"), _i18nService.T("Cancel"));
+
+            if (!userConfirmedExport)
+            {
+                return;
+            }
+
+            try
+            {
+                var data = await _exportService.GetExport(FileFormatOptions[FileFormatSelectedIndex].Key);
+                var fileFormat = FileFormatOptions[FileFormatSelectedIndex].Key;
+                fileFormat = fileFormat == "encrypted_json" ? "json" : fileFormat;
+
+                _defaultFilename = _exportService.GetFileName(null, fileFormat);
+                _exportResult = Encoding.UTF8.GetBytes(data);
+
+                if (!_deviceActionService.SaveFile(_exportResult, null, _defaultFilename, null))
                 {
                     ClearResult();
                     await _platformUtilsService.ShowDialogAsync(_i18nService.T("ExportVaultFailure"));
-                    System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", ex.GetType(), ex.StackTrace);
-#if !FDROID
-                    Crashes.TrackError(ex);
-#endif
                 }
             }
-            else
+            catch (Exception ex)
             {
-                await _platformUtilsService.ShowDialogAsync(_i18nService.T("InvalidMasterPassword"));
+                ClearResult();
+                await _platformUtilsService.ShowDialogAsync(_i18nService.T("ExportVaultFailure"));
+                System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", ex.GetType(), ex.StackTrace);
+#if !FDROID
+                Crashes.TrackError(ex);
+#endif
             }
         }
 
@@ -140,6 +158,26 @@ namespace Bit.App.Pages
             await _platformUtilsService.ShowDialogAsync(_i18nService.T("ExportVaultFailure"));
         }
 
+        public void UpdateWarning()
+        {
+            if (!_initialized)
+            {
+                return;
+            }
+
+            switch (FileFormatOptions[FileFormatSelectedIndex].Key)
+            {
+                case "encrypted_json":
+                    ExportWarningMessage = _i18nService.T("EncExportKeyWarning") +
+                        "\n\n" +
+                        _i18nService.T("EncExportAccountWarning");
+                    break;
+                default:
+                    ExportWarningMessage = _i18nService.T("ExportVaultWarning");
+                    break;
+            }
+        }
+
         private void ClearResult()
         {
             _defaultFilename = null;