bump version

Fix black navigation bar on none Google ROMs.

.editorconfig

@@ -0,0 +1,3 @@
+# All files
+[*]
+guidelines = 120

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

.gitignore

@@ -197,4 +197,5 @@ FakesAssemblies/
 
 # Other
 project.lock.json
-.DS_Store
+.DS_Store
+src/App/Css

CNAME

@@ -0,0 +1 @@
+mobileapp.bitwarden.com

CONTRIBUTING.md

@@ -1,33 +1,13 @@
 Code contributions are welcome! Please commit any pull requests against the `master` branch.
 
-# Internationalization (i18n)
+# Localization (l10n)
 
-If you are interested in helping translate the bitwarden mobile app into another language, please follow these steps
-when creating your pull request:
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/bitwarden-mobile/localized.svg)](https://crowdin.com/project/bitwarden-mobile)
 
-1. Create a new resource file under `/src/App/Resources` by copy/pasting the master English file, `AppResources.resx`.
-2. Rename your `AppResources.resx` copy to include the proper .NET culture code for your language (typically the two
-   letter code, ex. `sv`). You can find a list of culture codes here: <http://timtrott.co.uk/culture-codes/>. For
-   example, if I want to create a new translation for Swedish, I will rename my `AppResources.resx` copy to
-   `AppResources.sv.resx`.
-3. Open the `AppResources.XX.resx` file for your newly created language and start translating the `<value>` tags for
-   each `<data>` element. The `<data>` and `<comment>` properties should not be translated and remain in English.
-4. Repeat the same process for the store `COPY.md` and `CAPTIONS.md` files in `/store/apple` and `/store/google` by
-   creating a new folder for your language in each. Do not copy over the `assets` and `screenshots` folders to your new
-   language. We will update these based on your translations provided in `CAPTIONS.md`. Finally, do not translate the
-   titles in the markdown files (ex. `# Name` and `# Screenshot 1`). These are only for reference.
-5. If you have a Xamarin development environment setup, test your translations to make sure they look correct in the
-   app on iOS and Android. Sometimes the UI can break due to translations taking up more space than the original UI was
-   built for. If possible, use a shorter or abbreviated version of the word/sentence to accomedate the available space.
-   If you are unable to accomedate the avaialable space for a particular translation, just let us know in your pull
-   request comments. If you are unable to test your translations, just let us know in your pull request comments so
-   that we can check it for you.
-6. Be sure to watch for [future changes](https://github.com/bitwarden/mobile/commits/master/src/App/Resources/AppResources.resx)
-   to the `/src/App/Resources/AppResources.resx` file so that your translation will stay up to date.
+We use a translation tool called [Crowdin](https://crowdin.com) to help manage our localization efforts across many different languages.
 
-You can find an example of a proper translation pull request here: <https://github.com/bitwarden/mobile/pull/22/files>
+If you are interested in helping translate the Bitwarden mobile app into another language (or make a translation correction), please register an account at Crowdin and join our project here: https://crowdin.com/project/bitwarden-mobile
 
-You can read more about localizing a Xamarin.Forms app here:
-<https://developer.xamarin.com/guides/xamarin-forms/advanced/localization/>
+If the language that you are interested in translating is not already listed, create a new account on Crowdin, join the project, and contact the project owner (https://crowdin.com/profile/kspearrin).
 
-TIP: If you have Visual Studio installed, it provides a nice tabular UI for editing `resx` XML files.
+You can read Crowdin's getting started guide for translators here: https://support.crowdin.com/crowdin-intro/

ISSUE_TEMPLATE.md

@@ -0,0 +1,5 @@
+<!--
+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
+-->

README.md

@@ -1,27 +1,31 @@
-[![appveyor build](https://ci.appveyor.com/api/projects/status/github/bitwarden/mobile?branch=master&svg=true)] (https://ci.appveyor.com/project/bitwarden/mobile)
+[![appveyor build](https://ci.appveyor.com/api/projects/status/github/bitwarden/mobile?branch=master&svg=true)](https://ci.appveyor.com/project/bitwarden/mobile)
+[![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)
 
-# bitwarden mobile
+# Bitwarden Mobile Application
 
-<a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" target="_blank"><img alt="Get it on Google Play" src="https://imgur.com/YQzmZi9.png" width="153" height="46"></a> <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank"><img src="https://imgur.com/GdGqPMY.png" width="135" height="40"></a>
+<a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" target="_blank"><img alt="Get it on Google Play" src="https://imgur.com/YQzmZi9.png" width="153" height="46"></a> <a href="https://mobileapp.bitwarden.com/fdroid/" target="_blank"><img alt="Get it on Google Play" src="https://i.imgur.com/HDicnzz.png" width="154" height="46"></a> <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank"><img src="https://imgur.com/GdGqPMY.png" width="135" height="40"></a>
 
-The bitwarden mobile application is written in C# with Xamarin Android, Xamarin iOS, and Xamarin Forms.
+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.png" alt="" width="300" height="533" />
 
 # Build/Run
 
 **Requirements**
 
-- [Visual Studio w/ Xamarin -or- Xamarin Studio](https://store.xamarin.com/)
+- [Visual Studio](https://visualstudio.microsoft.com/)
+- [Xamarin](https://docs.microsoft.com/en-us/xamarin/get-started/installation/?pivots=windows)
 
-By default the app is targeting the production API. If you are running the [Core](https://github.com/bitwarden/core) API locally,
-you'll need to switch the app to target your local API. Open `src/App/Utilities/ApiHttpClient.cs` and set `BaseAddress` to your local
-API instance (ex. `new Uri("http://localhost:4000")`).
+**Run the app**
 
-After restoring the nuget packages, you can now build and run the app.
+- Open the solution file in Visual Studio.
+- Restore the nuget packages.
+- Build and run the app.
 
 # Contribute
 
-Code contributions are welcome! Visual Studio or Xamarin Studio is required to work on this project. Please commit any pull requests against the `master` branch.
+Code contributions are welcome! Visual Studio with Xamarin is required to work on this project. Please commit any pull requests against the `master` branch.
 Learn more about how to contribute by reading the [`CONTRIBUTING.md`](CONTRIBUTING.md) file.
 
-Security audits and feedback are welcome. Please open an issue or email us privately if the report is sensitive in nature.
+Security audits and feedback are welcome. Please open an issue or email us privately if the report is sensitive in nature. You can read our security policy in the [`SECURITY.md`](SECURITY.md) file.

SECURITY.md

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

appveyor.yml

@@ -1,14 +1,143 @@
-skip_tags: true
+image:
+- Visual Studio 2017
+- 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:
-  - nuget restore
-  - IF DEFINED keystore_dec_secret nuget install secure-file -ExcludeVersion
-after_build:
-  - ps: IF($env:keystore_dec_secret) { .\src\Android\increment-version.ps1 $($env:APPVEYOR_BUILD_FOLDER) $($env:APPVEYOR_BUILD_NUMBER) }
-  - IF DEFINED keystore_dec_secret secure-file\tools\secure-file -decrypt src\Android\8bit.keystore.enc -secret %keystore_dec_secret%
-  - IF DEFINED keystore_password msbuild "/t:SignAndroidPackage" "/p:Configuration=Release" "/p:AndroidKeyStore=true" "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=%keystore_password%" "/p:AndroidSigningKeyStore=8bit.keystore" "/p:AndroidSigningStorePass=%keystore_password%" "src\Android\Android.csproj"
-  - ps: IF($env:keystore_dec_secret) { copy-item src\Android\bin\Release\com.x8bit.bitwarden-Signed.apk .\com.x8bit.bitwarden-$($env:APPVEYOR_BUILD_NUMBER).apk }
+- ps: |
+    if($isWindows) {
+      nuget restore
+      if($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"
+      .\src\Android\ci-build-apks.ps1
+      Push-AppveyorArtifact .\com.x8bit.bitwarden.apk
+      Push-AppveyorArtifact .\com.x8bit.bitwarden-fdroid.apk
+    }
+
 on_success:
-  - IF DEFINED play_dec_secret secure-file\tools\secure-file -decrypt store\google\Publisher\play_creds.json.enc -secret %play_dec_secret%
-  - IF DEFINED play_dec_secret store\google\Publisher\bin\Debug\Publisher.exe %APPVEYOR_BUILD_FOLDER%\store\google\Publisher\play_creds.json %APPVEYOR_BUILD_FOLDER%\src\Android\bin\Release\com.x8bit.bitwarden-Signed.apk alpha
-artifacts:
-  - path: com.x8bit.bitwarden-%APPVEYOR_BUILD_NUMBER%.apk
+- sh: |
+    if [ "${APPVEYOR_REPO_TAG}" == "true" -a "${GH_TOKEN}" != "" ]
+    then
+      npm run deploy
+    fi
+- ps: |
+    if($isWindows -and $env:PLAY_DEC_SECRET) {
+      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.apk `
+        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

@@ -1,484 +1,306 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.539
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Android", "src\Android\Android.csproj", "{04B18ED2-B76D-4947-8474-191F8FD2B5E0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Android", "src\Android\Android.csproj", "{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS", "src\iOS\iOS.csproj", "{1F78403F-9A28-405B-9289-B9DBEB55F074}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App", "src\App\App.csproj", "{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "App", "src\App\App.csproj", "{B490C5DA-639E-4994-ABD2-54222B8A348E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\Core.csproj", "{4B8A8C41-9820-4341-974C-41E65B7F4366}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0D790714-ECF8-4A83-BE4A-E9C84DD1BB5D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playground", "test\Playground\Playground.csproj", "{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EC730FD9-F623-4B6C-B503-95CDCFBCF277}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D10CA4A9-F866-40E1-B658-F69051236C71}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "App.Test", "test\App.Test\App.Test.csproj", "{A300DCE1-8D10-4267-B96A-CB01AEB7C220}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Extension", "src\iOS.Extension\iOS.Extension.csproj", "{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Core", "src\iOS.Core\iOS.Core.csproj", "{B2538ADA-B605-4D6F-ACD2-62A409680F84}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Test", "test\iOS.Test\iOS.Test.csproj", "{6702027A-F726-4149-863E-7CB924674B9A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Android.Test", "test\Android.Test\Android.Test.csproj", "{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8904C536-C67D-420F-9971-51B26574C3AA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "store", "store", "{92470CBD-9047-4C3C-8EA3-D972D6622D84}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "google", "google", "{2E399654-26A2-46F6-B9CA-1B496A3F370A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Publisher", "store\google\Publisher\Publisher.csproj", "{428CACAB-CC26-4F41-9062-1E4A9BC82640}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{76690DFB-B7F4-4781-83E4-113FDC450AFE}"
+	ProjectSection(SolutionItems) = preProject
+		.gitignore = .gitignore
+		appveyor.yml = appveyor.yml
+		CONTRIBUTING.md = CONTRIBUTING.md
+		crowdin.yml = crowdin.yml
+		README.md = README.md
+		SECURITY.md = SECURITY.md
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Publisher", "store\google\Publisher\Publisher.csproj", "{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Core", "src\iOS.Core\iOS.Core.csproj", "{E71F3053-056C-4381-9638-048ED73BDFF6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS", "src\iOS\iOS.csproj", "{599E0201-420A-4C3E-A7BA-5349F72E0B15}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
-		Ad-Hoc|ARM = Ad-Hoc|ARM
 		Ad-Hoc|iPhone = Ad-Hoc|iPhone
 		Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
-		Ad-Hoc|x64 = Ad-Hoc|x64
-		Ad-Hoc|x86 = Ad-Hoc|x86
 		AppStore|Any CPU = AppStore|Any CPU
-		AppStore|ARM = AppStore|ARM
 		AppStore|iPhone = AppStore|iPhone
 		AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
-		AppStore|x64 = AppStore|x64
-		AppStore|x86 = AppStore|x86
 		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
 		Debug|iPhone = Debug|iPhone
 		Debug|iPhoneSimulator = Debug|iPhoneSimulator
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
+		FDroid|Any CPU = FDroid|Any CPU
+		FDroid|iPhone = FDroid|iPhone
+		FDroid|iPhoneSimulator = FDroid|iPhoneSimulator
 		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
 		Release|iPhone = Release|iPhone
 		Release|iPhoneSimulator = Release|iPhoneSimulator
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|ARM.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|x64.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|x86.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|ARM.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|ARM.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|x64.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|x64.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|x86.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|x86.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|ARM.Build.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|ARM.Deploy.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|x64.Build.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|x64.Deploy.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|x86.Build.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|x86.Deploy.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|ARM.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|ARM.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|ARM.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|x64.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|x64.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|x64.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|x86.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|x86.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|x86.Deploy.0 = Release|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.AppStore|ARM.ActiveCfg = AppStore|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.AppStore|x64.ActiveCfg = AppStore|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.AppStore|x86.ActiveCfg = AppStore|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|Any CPU.ActiveCfg = Debug|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|ARM.ActiveCfg = Debug|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|iPhone.Build.0 = Debug|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|x64.ActiveCfg = Debug|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|x64.Build.0 = Debug|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|x86.ActiveCfg = Debug|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|x86.Build.0 = Debug|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Release|Any CPU.ActiveCfg = Release|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Release|ARM.ActiveCfg = Release|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Release|iPhone.ActiveCfg = Release|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Release|iPhone.Build.0 = Release|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Release|x64.ActiveCfg = Release|iPhone
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Release|x86.ActiveCfg = Release|iPhone
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.AppStore|ARM.Build.0 = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.AppStore|x64.Build.0 = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.AppStore|x86.Build.0 = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Debug|ARM.Build.0 = Debug|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Debug|x64.Build.0 = Debug|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Debug|x86.Build.0 = Debug|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Release|ARM.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Release|ARM.Build.0 = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Release|iPhone.Build.0 = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Release|x64.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Release|x64.Build.0 = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Release|x86.ActiveCfg = Release|Any CPU
-		{B490C5DA-639E-4994-ABD2-54222B8A348E}.Release|x86.Build.0 = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|ARM.Build.0 = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|x64.Build.0 = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|x86.Build.0 = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|ARM.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|x64.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|x86.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|ARM.Build.0 = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|x64.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|x64.Build.0 = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|x86.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|x86.Build.0 = Release|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.AppStore|ARM.ActiveCfg = AppStore|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.AppStore|x64.ActiveCfg = AppStore|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.AppStore|x86.ActiveCfg = AppStore|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|Any CPU.ActiveCfg = Debug|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|ARM.ActiveCfg = Debug|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|iPhone.Build.0 = Debug|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|x64.ActiveCfg = Debug|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|x64.Build.0 = Debug|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|x86.ActiveCfg = Debug|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|x86.Build.0 = Debug|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Release|Any CPU.ActiveCfg = Release|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Release|ARM.ActiveCfg = Release|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Release|iPhone.ActiveCfg = Release|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Release|iPhone.Build.0 = Release|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Release|x64.ActiveCfg = Release|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Release|x86.ActiveCfg = Release|iPhone
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|ARM.Build.0 = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|x64.Build.0 = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|x86.Build.0 = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Debug|x64.Build.0 = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Debug|x86.Build.0 = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Release|ARM.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Release|iPhone.Build.0 = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Release|x64.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Release|x64.Build.0 = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Release|x86.ActiveCfg = Release|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Release|x86.Build.0 = Release|Any CPU
-		{6702027A-F726-4149-863E-7CB924674B9A}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{6702027A-F726-4149-863E-7CB924674B9A}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{6702027A-F726-4149-863E-7CB924674B9A}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.AppStore|ARM.ActiveCfg = AppStore|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{6702027A-F726-4149-863E-7CB924674B9A}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{6702027A-F726-4149-863E-7CB924674B9A}.AppStore|x64.ActiveCfg = AppStore|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.AppStore|x86.ActiveCfg = AppStore|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.Debug|Any CPU.ActiveCfg = Debug|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.Debug|ARM.ActiveCfg = Debug|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.Debug|iPhone.Build.0 = Debug|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{6702027A-F726-4149-863E-7CB924674B9A}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{6702027A-F726-4149-863E-7CB924674B9A}.Debug|x64.ActiveCfg = Debug|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.Debug|x86.ActiveCfg = Debug|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.Release|Any CPU.ActiveCfg = Release|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.Release|ARM.ActiveCfg = Release|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.Release|iPhone.ActiveCfg = Release|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.Release|iPhone.Build.0 = Release|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{6702027A-F726-4149-863E-7CB924674B9A}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{6702027A-F726-4149-863E-7CB924674B9A}.Release|x64.ActiveCfg = Release|iPhone
-		{6702027A-F726-4149-863E-7CB924674B9A}.Release|x86.ActiveCfg = Release|iPhone
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|ARM.Deploy.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|x64.Deploy.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Ad-Hoc|x86.Deploy.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|ARM.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|ARM.Deploy.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|iPhone.Deploy.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|x64.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|x64.Deploy.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|x86.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.AppStore|x86.Deploy.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|ARM.Build.0 = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|ARM.Deploy.0 = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|x64.Build.0 = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|x64.Deploy.0 = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|x86.Build.0 = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Debug|x86.Deploy.0 = Debug|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|ARM.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|ARM.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|ARM.Deploy.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|iPhone.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|x64.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|x64.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|x64.Deploy.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|x86.ActiveCfg = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|x86.Build.0 = Release|Any CPU
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}.Release|x86.Deploy.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.AppStore|ARM.Build.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.AppStore|x64.Build.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.AppStore|x86.Build.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Debug|ARM.Build.0 = Debug|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Debug|x64.Build.0 = Debug|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Debug|x86.Build.0 = Debug|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Release|Any CPU.Build.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Release|ARM.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Release|ARM.Build.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Release|iPhone.Build.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Release|x64.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Release|x64.Build.0 = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Release|x86.ActiveCfg = Release|Any CPU
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640}.Release|x86.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhone.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhone.Deploy.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|Any CPU.Deploy.0 = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhone.Build.0 = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhone.Deploy.0 = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhoneSimulator.Deploy.0 = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhone.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhone.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|Any CPU.Deploy.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhone.Deploy.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|Any CPU.Deploy.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhone.Deploy.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhoneSimulator.Deploy.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhone.Deploy.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|iPhone.Build.0 = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhone.Build.0 = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhone.Deploy.0 = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|iPhone.Build.0 = FDroid|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|iPhone.Build.0 = Release|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|iPhone.Build.0 = FDroid|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|iPhone.Build.0 = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|iPhone.Build.0 = FDroid|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhone.Build.0 = Release|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|Any CPU.ActiveCfg = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|Any CPU.Build.0 = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.ActiveCfg = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.Build.0 = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.Build.0 = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|Any CPU.ActiveCfg = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|Any CPU.Build.0 = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.ActiveCfg = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.Build.0 = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.Build.0 = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhone.Build.0 = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhone.Build.0 = Release|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhone.Build.0 = AppStore|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|Any CPU.ActiveCfg = Debug|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhone.Build.0 = Debug|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|Any CPU.ActiveCfg = FDroid|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhone.ActiveCfg = FDroid|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhone.Build.0 = FDroid|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhoneSimulator.Build.0 = FDroid|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|Any CPU.ActiveCfg = Release|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhone.ActiveCfg = Release|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhone.Build.0 = Release|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0} = {EC730FD9-F623-4B6C-B503-95CDCFBCF277}
-		{1F78403F-9A28-405B-9289-B9DBEB55F074} = {EC730FD9-F623-4B6C-B503-95CDCFBCF277}
-		{B490C5DA-639E-4994-ABD2-54222B8A348E} = {EC730FD9-F623-4B6C-B503-95CDCFBCF277}
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220} = {0D790714-ECF8-4A83-BE4A-E9C84DD1BB5D}
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422} = {EC730FD9-F623-4B6C-B503-95CDCFBCF277}
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84} = {EC730FD9-F623-4B6C-B503-95CDCFBCF277}
-		{6702027A-F726-4149-863E-7CB924674B9A} = {0D790714-ECF8-4A83-BE4A-E9C84DD1BB5D}
-		{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE} = {0D790714-ECF8-4A83-BE4A-E9C84DD1BB5D}
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F} = {D10CA4A9-F866-40E1-B658-F69051236C71}
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C} = {D10CA4A9-F866-40E1-B658-F69051236C71}
+		{4B8A8C41-9820-4341-974C-41E65B7F4366} = {D10CA4A9-F866-40E1-B658-F69051236C71}
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3} = {8904C536-C67D-420F-9971-51B26574C3AA}
 		{2E399654-26A2-46F6-B9CA-1B496A3F370A} = {92470CBD-9047-4C3C-8EA3-D972D6622D84}
-		{428CACAB-CC26-4F41-9062-1E4A9BC82640} = {2E399654-26A2-46F6-B9CA-1B496A3F370A}
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D} = {2E399654-26A2-46F6-B9CA-1B496A3F370A}
+		{E71F3053-056C-4381-9638-048ED73BDFF6} = {D10CA4A9-F866-40E1-B658-F69051236C71}
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15} = {D10CA4A9-F866-40E1-B658-F69051236C71}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7D436EA3-8B7E-45D2-8D14-0730BD2E0410}
 	EndGlobalSection
 EndGlobal

crowdin.yml

@@ -0,0 +1,31 @@
+files:
+  - source: /src/App/Resources/AppResources.resx
+    translation: /src/App/Resources/AppResources.%two_letters_code%.resx
+    update_option: update_as_unapproved
+    languages_mapping:
+      two_letters_code:
+        zh-CN: zh-Hans
+        zh-TW: zh-Hant
+        pt-PT: pt-PT
+        pt-BR: pt-BR
+        en-GB: en-GB
+  - source: /store/apple/en/copy.resx
+    translation: /store/apple/%two_letters_code%/copy.resx
+    update_option: update_as_unapproved
+    languages_mapping:
+      two_letters_code:
+        zh-CN: zh-Hans
+        zh-TW: zh-Hant
+        pt-PT: pt-PT
+        pt-BR: pt-BR
+        en-GB: en-GB
+  - source: /store/google/en/copy.resx
+    translation: /store/google/%two_letters_code%/copy.resx
+    update_option: update_as_unapproved
+    languages_mapping:
+      two_letters_code:
+        zh-CN: zh-Hans
+        zh-TW: zh-Hant
+        pt-BR: pt-BR
+        pt-PT: pt-PT
+        en-GB: en-GB

package-lock.json

@@ -0,0 +1,344 @@
+{
+  "name": "bitwarden-fdroid",
+  "version": "0.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "^1.0.1"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "async": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+      "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.10"
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "commander": {
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "filename-reserved-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
+      "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=",
+      "dev": true
+    },
+    "filenamify": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
+      "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
+      "dev": true,
+      "requires": {
+        "filename-reserved-regex": "^1.0.0",
+        "strip-outer": "^1.0.0",
+        "trim-repeated": "^1.0.0"
+      }
+    },
+    "filenamify-url": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/filenamify-url/-/filenamify-url-1.0.0.tgz",
+      "integrity": "sha1-syvYExnvWGO3MHi+1Q9GpPeXX1A=",
+      "dev": true,
+      "requires": {
+        "filenamify": "^1.0.0",
+        "humanize-url": "^1.0.0"
+      }
+    },
+    "fs-extra": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
+      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "gh-pages": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-1.2.0.tgz",
+      "integrity": "sha512-cGLYAvxtlQ1iTwAS4g7FreZPXoE/g62Fsxln2mmR19mgs4zZI+XJ+wVVUhBFCF/0+Nmvbq+abyTWue1m1BSnmg==",
+      "dev": true,
+      "requires": {
+        "async": "2.6.1",
+        "commander": "2.15.1",
+        "filenamify-url": "^1.0.0",
+        "fs-extra": "^5.0.0",
+        "globby": "^6.1.0",
+        "graceful-fs": "4.1.11",
+        "rimraf": "^2.6.2"
+      }
+    },
+    "glob": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "globby": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+      "dev": true,
+      "requires": {
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true
+    },
+    "humanize-url": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/humanize-url/-/humanize-url-1.0.1.tgz",
+      "integrity": "sha1-9KuZ4NKIF0yk4eUEB8VfuuRk7/8=",
+      "dev": true,
+      "requires": {
+        "normalize-url": "^1.0.0",
+        "strip-url-auth": "^1.0.0"
+      }
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true
+    },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "lodash": {
+      "version": "4.17.11",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "normalize-url": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
+      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
+      "dev": true,
+      "requires": {
+        "object-assign": "^4.0.1",
+        "prepend-http": "^1.0.0",
+        "query-string": "^4.1.0",
+        "sort-keys": "^1.0.0"
+      }
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+      "dev": true
+    },
+    "query-string": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
+      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
+      "dev": true,
+      "requires": {
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+      "dev": true,
+      "requires": {
+        "is-plain-obj": "^1.0.0"
+      }
+    },
+    "strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+      "dev": true
+    },
+    "strip-outer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
+      "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.2"
+      }
+    },
+    "strip-url-auth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-url-auth/-/strip-url-auth-1.0.1.tgz",
+      "integrity": "sha1-IrD6OkE4WzO+PzMVUbu4N/oM164=",
+      "dev": true
+    },
+    "trim-repeated": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
+      "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.2"
+      }
+    },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    }
+  }
+}

package.json

@@ -0,0 +1,11 @@
+{
+  "name": "bitwarden-mobile",
+  "version": "0.0.0",
+  "scripts": {
+    "deploy": "gh-pages --dist dist",
+    "clean:l10n": "git push origin --delete l10n_master"
+  },
+  "devDependencies": {
+    "gh-pages": "^1.2.0"
+  }
+}

src/Android/Accessibility/AccessibilityActivity.cs

@@ -3,19 +3,16 @@ using Android.Content;
 using Android.OS;
 using Android.Runtime;
 using Android.Views;
+using System;
 
-namespace Bit.Android
+namespace Bit.Droid.Accessibility
 {
-    [Activity(Theme = "@style/BitwardenTheme.Splash",
-        Label = "bitwarden",
-        Icon = "@drawable/icon",
-        WindowSoftInputMode = SoftInput.StateHidden)]
-    public class AutofillActivity : Activity
+    [Activity(Theme = "@style/LightTheme.Splash", WindowSoftInputMode = SoftInput.StateHidden)]
+    public class AccessibilityActivity : Activity
     {
+        private DateTime? _lastLaunch = null;
         private string _lastQueriedUri;
 
-        public static AutofillCredentials LastCredentials { get; set; }
-
         protected override void OnCreate(Bundle bundle)
         {
             base.OnCreate(bundle);
@@ -41,7 +38,6 @@ namespace Bit.Android
                 Finish();
                 return;
             }
-
             Intent.RemoveExtra("uri");
         }
 
@@ -50,7 +46,7 @@ namespace Bit.Android
             base.OnActivityResult(requestCode, resultCode, data);
             if(data == null)
             {
-                LastCredentials = null;
+                AccessibilityHelpers.LastCredentials = null;
             }
             else
             {
@@ -58,15 +54,14 @@ namespace Bit.Android
                 {
                     if(data.GetStringExtra("canceled") != null)
                     {
-                        LastCredentials = null;
+                        AccessibilityHelpers.LastCredentials = null;
                     }
                     else
                     {
                         var uri = data.GetStringExtra("uri");
                         var username = data.GetStringExtra("username");
                         var password = data.GetStringExtra("password");
-
-                        LastCredentials = new AutofillCredentials
+                        AccessibilityHelpers.LastCredentials = new Credentials
                         {
                             Username = username,
                             Password = password,
@@ -77,10 +72,9 @@ namespace Bit.Android
                 }
                 catch
                 {
-                    LastCredentials = null;
+                    AccessibilityHelpers.LastCredentials = null;
                 }
             }
-
             Finish();
         }
 
@@ -92,7 +86,13 @@ namespace Bit.Android
                 Finish();
                 return;
             }
+            var now = DateTime.UtcNow;
+            if(_lastLaunch.HasValue && (now - _lastLaunch.Value) <= TimeSpan.FromSeconds(2))
+            {
+                return;
+            }
 
+            _lastLaunch = now;
             var intent = new Intent(this, typeof(MainActivity));
             if(!callingIntent.Flags.HasFlag(ActivityFlags.LaunchedFromHistory))
             {

src/Android/Accessibility/AccessibilityHelpers.cs

@@ -0,0 +1,246 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Android.OS;
+using Android.Views.Accessibility;
+using Bit.Core;
+
+namespace Bit.Droid.Accessibility
+{
+    public static class AccessibilityHelpers
+    {
+        public static Credentials LastCredentials = null;
+        public static string SystemUiPackage = "com.android.systemui";
+        public static string BitwardenTag = "bw_access";
+
+        public static Dictionary<string, Browser> SupportedBrowsers => new List<Browser>
+        {
+            new Browser("com.android.chrome", "url_bar"),
+            new Browser("com.chrome.beta", "url_bar"),
+            new Browser("org.chromium.chrome", "url_bar"),
+            new Browser("com.android.browser", "url"),
+            new Browser("com.brave.browser", "url_bar"),
+            new Browser("com.opera.browser", "url_field"),
+            new Browser("com.opera.browser.beta", "url_field"),
+            new Browser("com.opera.mini.native", "url_field"),
+            new Browser("com.opera.touch", "addressbarEdit"),
+            new Browser("com.chrome.dev", "url_bar"),
+            new Browser("com.chrome.canary", "url_bar"),
+            new Browser("com.google.android.apps.chrome", "url_bar"),
+            new Browser("com.google.android.apps.chrome_dev", "url_bar"),
+            new Browser("org.codeaurora.swe.browser", "url_bar"),
+            new Browser("org.iron.srware", "url_bar"),
+            new Browser("com.sec.android.app.sbrowser", "location_bar_edit_text"),
+            new Browser("com.sec.android.app.sbrowser.beta", "location_bar_edit_text"),
+            new Browser("com.yandex.browser", "bro_omnibar_address_title_text",
+                (s) => s.Split(new char[]{' ', ' '}).FirstOrDefault()), // 0 = Regular Space, 1 = No-break space (00A0)
+            new Browser("org.mozilla.firefox", "url_bar_title"),
+            new Browser("org.mozilla.firefox_beta", "url_bar_title"),
+            new Browser("org.mozilla.fennec_aurora", "url_bar_title"),
+            new Browser("org.mozilla.focus", "display_url"),
+            new Browser("org.mozilla.klar", "display_url"),
+            new Browser("org.mozilla.fenix", "mozac_browser_toolbar_url_view"),
+            new Browser("org.mozilla.reference.browser", "mozac_browser_toolbar_url_view"),
+            new Browser("com.ghostery.android.ghostery", "search_field"),
+            new Browser("org.adblockplus.browser", "url_bar_title"),
+            new Browser("com.htc.sense.browser", "title"),
+            new Browser("com.amazon.cloud9", "url"),
+            new Browser("mobi.mgeek.TunnyBrowser", "title"),
+            new Browser("com.nubelacorp.javelin", "enterUrl"),
+            new Browser("com.jerky.browser2", "enterUrl"),
+            new Browser("com.mx.browser", "address_editor_with_progress"),
+            new Browser("com.mx.browser.tablet", "address_editor_with_progress"),
+            new Browser("com.linkbubble.playstore", "url_text"),
+            new Browser("com.ksmobile.cb", "address_bar_edit_text"),
+            new Browser("acr.browser.lightning", "search"),
+            new Browser("acr.browser.barebones", "search"),
+            new Browser("com.microsoft.emmx", "url_bar"),
+            new Browser("com.duckduckgo.mobile.android", "omnibarTextInput"),
+            new Browser("mark.via.gp", "aw"),
+            new Browser("org.bromite.bromite", "url_bar"),
+            new Browser("com.kiwibrowser.browser", "url_bar"),
+            new Browser("com.ecosia.android", "url_bar"),
+            new Browser("com.qwant.liberty", "url_bar_title"),
+        }.ToDictionary(n => n.PackageName);
+
+        // Known packages to skip
+        public static HashSet<string> FilteredPackageNames => new HashSet<string>
+        {
+            SystemUiPackage,
+            "com.google.android.googlequicksearchbox",
+            "com.google.android.apps.nexuslauncher",
+            "com.google.android.launcher",
+            "com.computer.desktop.ui.launcher",
+            "com.launcher.notelauncher",
+            "com.anddoes.launcher",
+            "com.actionlauncher.playstore",
+            "ch.deletescape.lawnchair.plah",
+            "com.microsoft.launcher",
+            "com.teslacoilsw.launcher",
+            "com.teslacoilsw.launcher.prime",
+            "is.shortcut",
+            "me.craftsapp.nlauncher",
+            "com.ss.squarehome2"
+        };
+
+        public static void PrintTestData(AccessibilityNodeInfo root, AccessibilityEvent e)
+        {
+            var testNodes = GetWindowNodes(root, e, n => n.ViewIdResourceName != null && n.Text != null, false);
+            var testNodesData = testNodes.Select(n => new { id = n.ViewIdResourceName, text = n.Text });
+        }
+
+        public static string GetUri(AccessibilityNodeInfo root)
+        {
+            var uri = string.Concat(Constants.AndroidAppProtocol, root.PackageName);
+            if(SupportedBrowsers.ContainsKey(root.PackageName))
+            {
+                var browser = SupportedBrowsers[root.PackageName];
+                var addressNode = root.FindAccessibilityNodeInfosByViewId(
+                    $"{root.PackageName}:id/{browser.UriViewId}").FirstOrDefault();
+                if(addressNode != null)
+                {
+                    uri = ExtractUri(uri, addressNode, browser);
+                    addressNode.Dispose();
+                }
+            }
+            return uri;
+        }
+
+        public static string ExtractUri(string uri, AccessibilityNodeInfo addressNode, Browser browser)
+        {
+            if(addressNode?.Text == null)
+            {
+                return uri;
+            }
+            if(addressNode.Text == null)
+            {
+                return uri;
+            }
+            uri = browser.GetUriFunction(addressNode.Text)?.Trim();
+            if(uri != null && uri.Contains("."))
+            {
+                if(!uri.Contains("://") && !uri.Contains(" "))
+                {
+                    uri = string.Concat("http://", uri);
+                }
+                else if(Build.VERSION.SdkInt <= BuildVersionCodes.KitkatWatch)
+                {
+                    var parts = uri.Split(new string[] { ". " }, StringSplitOptions.None);
+                    if(parts.Length > 1)
+                    {
+                        var urlPart = parts.FirstOrDefault(p => p.StartsWith("http"));
+                        if(urlPart != null)
+                        {
+                            uri = urlPart.Trim();
+                        }
+                    }
+                }
+            }
+            return uri;
+        }
+
+        /// <summary>
+        /// Check to make sure it is ok to autofill still on the current screen
+        /// </summary>
+        public static bool NeedToAutofill(Credentials credentials, string currentUriString)
+        {
+            if(credentials == null)
+            {
+                return false;
+            }
+            if(Uri.TryCreate(credentials.LastUri, UriKind.Absolute, out Uri lastUri) &&
+                Uri.TryCreate(currentUriString, UriKind.Absolute, out Uri currentUri))
+            {
+                return lastUri.Host == currentUri.Host;
+            }
+            return false;
+        }
+
+        public static bool EditText(AccessibilityNodeInfo n)
+        {
+            return n?.ClassName?.Contains("EditText") ?? false;
+        }
+
+
+        public static void FillCredentials(AccessibilityNodeInfo usernameNode,
+            IEnumerable<AccessibilityNodeInfo> passwordNodes)
+        {
+            FillEditText(usernameNode, LastCredentials?.Username);
+            foreach(var n in passwordNodes)
+            {
+                FillEditText(n, LastCredentials?.Password);
+            }
+        }
+
+        public static void FillEditText(AccessibilityNodeInfo editTextNode, string value)
+        {
+            if(editTextNode == null || value == null)
+            {
+                return;
+            }
+            var bundle = new Bundle();
+            bundle.PutString(AccessibilityNodeInfo.ActionArgumentSetTextCharsequence, value);
+            editTextNode.PerformAction(Android.Views.Accessibility.Action.SetText, bundle);
+        }
+
+        public static NodeList GetWindowNodes(AccessibilityNodeInfo n, AccessibilityEvent e,
+            Func<AccessibilityNodeInfo, bool> condition, bool disposeIfUnused, NodeList nodes = null,
+            int recursionDepth = 0)
+        {
+            if(nodes == null)
+            {
+                nodes = new NodeList();
+            }
+            var dispose = disposeIfUnused;
+            if(n != null && recursionDepth < 50)
+            {
+                var add = n.WindowId == e.WindowId &&
+                    !(n.ViewIdResourceName?.StartsWith(SystemUiPackage) ?? false) &&
+                    condition(n);
+                if(add)
+                {
+                    dispose = false;
+                    nodes.Add(n);
+                }
+
+                for(var i = 0; i < n.ChildCount; i++)
+                {
+                    var childNode = n.GetChild(i);
+                    if(i > 100)
+                    {
+                        Android.Util.Log.Info(BitwardenTag, "Too many child iterations.");
+                        break;
+                    }
+                    else if(childNode.GetHashCode() == n.GetHashCode())
+                    {
+                        Android.Util.Log.Info(BitwardenTag, "Child node is the same as parent for some reason.");
+                    }
+                    else
+                    {
+                        GetWindowNodes(childNode, e, condition, true, nodes, recursionDepth++);
+                    }
+                }
+            }
+            if(dispose)
+            {
+                n?.Dispose();
+            }
+            return nodes;
+        }
+
+        public static void GetNodesAndFill(AccessibilityNodeInfo root, AccessibilityEvent e,
+            IEnumerable<AccessibilityNodeInfo> passwordNodes)
+        {
+            var allEditTexts = GetWindowNodes(root, e, n => EditText(n), false);
+            var usernameEditText = GetUsernameEditText(allEditTexts);
+            FillCredentials(usernameEditText, passwordNodes);
+            allEditTexts.Dispose();
+            usernameEditText = null;
+        }
+
+        public static AccessibilityNodeInfo GetUsernameEditText(IEnumerable<AccessibilityNodeInfo> allEditTexts)
+        {
+            return allEditTexts.TakeWhile(n => !n.Password).LastOrDefault();
+        }
+    }
+}

src/Android/Accessibility/AccessibilityService.cs

@@ -0,0 +1,310 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Views.Accessibility;
+using Bit.App.Resources;
+using Bit.Core;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+
+namespace Bit.Droid.Accessibility
+{
+    [Service(Permission = Android.Manifest.Permission.BindAccessibilityService, Label = "Bitwarden")]
+    [IntentFilter(new string[] { "android.accessibilityservice.AccessibilityService" })]
+    [MetaData("android.accessibilityservice", Resource = "@xml/accessibilityservice")]
+    [Register("com.x8bit.bitwarden.Accessibility.AccessibilityService")]
+    public class AccessibilityService : Android.AccessibilityServices.AccessibilityService
+    {
+        private NotificationChannel _notificationChannel;
+
+        private const int AutoFillNotificationId = 34573;
+        private const string BitwardenPackage = "com.x8bit.bitwarden";
+        private const string BitwardenWebsite = "vault.bitwarden.com";
+
+        private IStorageService _storageService;
+        private bool _settingAutofillPasswordField;
+        private bool _settingAutofillPersistNotification;
+        private DateTime? _lastSettingsReload = null;
+        private TimeSpan _settingsReloadSpan = TimeSpan.FromMinutes(1);
+        private long _lastNotificationTime = 0;
+        private string _lastNotificationUri = null;
+        private HashSet<string> _launcherPackageNames = null;
+        private DateTime? _lastLauncherSetBuilt = null;
+        private TimeSpan _rebuildLauncherSpan = TimeSpan.FromHours(1);
+
+        public override void OnAccessibilityEvent(AccessibilityEvent e)
+        {
+            try
+            {
+                var powerManager = GetSystemService(PowerService) as PowerManager;
+                if(Build.VERSION.SdkInt > BuildVersionCodes.KitkatWatch && !powerManager.IsInteractive)
+                {
+                    return;
+                }
+                else if(Build.VERSION.SdkInt < BuildVersionCodes.Lollipop && !powerManager.IsScreenOn)
+                {
+                    return;
+                }
+
+                if(SkipPackage(e?.PackageName))
+                {
+                    return;
+                }
+
+                var root = RootInActiveWindow;
+                if(root == null || root.PackageName != e.PackageName)
+                {
+                    return;
+                }
+
+                // AccessibilityHelpers.PrintTestData(root, e);
+                LoadServices();
+                var settingsTask = LoadSettingsAsync();
+
+                var notificationManager = GetSystemService(NotificationService) as NotificationManager;
+                var cancelNotification = true;
+
+                switch(e.EventType)
+                {
+                    case EventTypes.ViewFocused:
+                        if(e.Source == null || !e.Source.Password || !_settingAutofillPasswordField)
+                        {
+                            break;
+                        }
+                        if(e.PackageName == BitwardenPackage)
+                        {
+                            CancelNotification(notificationManager);
+                            break;
+                        }
+                        if(ScanAndAutofill(root, e, notificationManager, cancelNotification))
+                        {
+                            CancelNotification(notificationManager);
+                        }
+                        break;
+                    case EventTypes.WindowContentChanged:
+                    case EventTypes.WindowStateChanged:
+                        if(_settingAutofillPasswordField && e.Source.Password)
+                        {
+                            break;
+                        }
+                        else if(_settingAutofillPasswordField && AccessibilityHelpers.LastCredentials == null)
+                        {
+                            if(string.IsNullOrWhiteSpace(_lastNotificationUri))
+                            {
+                                CancelNotification(notificationManager);
+                                break;
+                            }
+                            var uri = AccessibilityHelpers.GetUri(root);
+                            if(uri != _lastNotificationUri)
+                            {
+                                CancelNotification(notificationManager);
+                            }
+                            else if(uri.StartsWith(Constants.AndroidAppProtocol))
+                            {
+                                CancelNotification(notificationManager, 30000);
+                            }
+                            break;
+                        }
+
+                        if(e.PackageName == BitwardenPackage)
+                        {
+                            CancelNotification(notificationManager);
+                            break;
+                        }
+
+                        if(_settingAutofillPersistNotification)
+                        {
+                            var uri = AccessibilityHelpers.GetUri(root);
+                            if(uri != null && !uri.Contains(BitwardenWebsite))
+                            {
+                                var needToFill = AccessibilityHelpers.NeedToAutofill(
+                                    AccessibilityHelpers.LastCredentials, uri);
+                                if(needToFill)
+                                {
+                                    var passwordNodes = AccessibilityHelpers.GetWindowNodes(root, e,
+                                        n => n.Password, false);
+                                    needToFill = passwordNodes.Any();
+                                    if(needToFill)
+                                    {
+                                        AccessibilityHelpers.GetNodesAndFill(root, e, passwordNodes);
+                                    }
+                                    passwordNodes.Dispose();
+                                }
+                                if(!needToFill)
+                                {
+                                    NotifyToAutofill(uri, notificationManager);
+                                    cancelNotification = false;
+                                }
+                            }
+                            AccessibilityHelpers.LastCredentials = null;
+                        }
+                        else
+                        {
+                            cancelNotification = ScanAndAutofill(root, e, notificationManager, cancelNotification);
+                        }
+
+                        if(cancelNotification)
+                        {
+                            CancelNotification(notificationManager);
+                        }
+                        break;
+                    default:
+                        break;
+                }
+
+                notificationManager?.Dispose();
+                root.Dispose();
+                e.Dispose();
+            }
+            // Suppress exceptions so that service doesn't crash.
+            catch { }
+        }
+
+        public override void OnInterrupt()
+        {
+            // Do nothing.
+        }
+
+        public bool ScanAndAutofill(AccessibilityNodeInfo root, AccessibilityEvent e,
+            NotificationManager notificationManager, bool cancelNotification)
+        {
+            var passwordNodes = AccessibilityHelpers.GetWindowNodes(root, e, n => n.Password, false);
+            if(passwordNodes.Count > 0)
+            {
+                var uri = AccessibilityHelpers.GetUri(root);
+                if(uri != null && !uri.Contains(BitwardenWebsite))
+                {
+                    if(AccessibilityHelpers.NeedToAutofill(AccessibilityHelpers.LastCredentials, uri))
+                    {
+                        AccessibilityHelpers.GetNodesAndFill(root, e, passwordNodes);
+                    }
+                    else
+                    {
+                        NotifyToAutofill(uri, notificationManager);
+                        cancelNotification = false;
+                    }
+                }
+                AccessibilityHelpers.LastCredentials = null;
+            }
+            else if(AccessibilityHelpers.LastCredentials != null)
+            {
+                Task.Run(async () =>
+                {
+                    await Task.Delay(1000);
+                    AccessibilityHelpers.LastCredentials = null;
+                });
+            }
+            passwordNodes.Dispose();
+            return cancelNotification;
+        }
+
+        public void CancelNotification(NotificationManager notificationManager, long limit = 250)
+        {
+            if(Java.Lang.JavaSystem.CurrentTimeMillis() - _lastNotificationTime < limit)
+            {
+                return;
+            }
+            _lastNotificationUri = null;
+            notificationManager?.Cancel(AutoFillNotificationId);
+        }
+
+        private void NotifyToAutofill(string uri, NotificationManager notificationManager)
+        {
+            if(notificationManager == null || string.IsNullOrWhiteSpace(uri))
+            {
+                return;
+            }
+
+            var now = Java.Lang.JavaSystem.CurrentTimeMillis();
+            var intent = new Intent(this, typeof(AccessibilityActivity));
+            intent.PutExtra("uri", uri);
+            intent.SetFlags(ActivityFlags.NewTask | ActivityFlags.SingleTop | ActivityFlags.ClearTop);
+            var pendingIntent = PendingIntent.GetActivity(this, 0, intent, PendingIntentFlags.UpdateCurrent);
+
+            var notificationContent = Build.VERSION.SdkInt > BuildVersionCodes.KitkatWatch ?
+                AppResources.BitwardenAutofillServiceNotificationContent :
+                AppResources.BitwardenAutofillServiceNotificationContentOld;
+
+            var builder = new Notification.Builder(this);
+            builder.SetSmallIcon(Resource.Drawable.shield)
+                   .SetContentTitle(AppResources.BitwardenAutofillService)
+                   .SetContentText(notificationContent)
+                   .SetTicker(notificationContent)
+                   .SetWhen(now)
+                   .SetContentIntent(pendingIntent);
+
+            if(Build.VERSION.SdkInt > BuildVersionCodes.KitkatWatch)
+            {
+                builder.SetVisibility(NotificationVisibility.Secret)
+                    .SetColor(Android.Support.V4.Content.ContextCompat.GetColor(ApplicationContext,
+                        Resource.Color.primary));
+            }
+            if(Build.VERSION.SdkInt >= BuildVersionCodes.O)
+            {
+                if(_notificationChannel == null)
+                {
+                    _notificationChannel = new NotificationChannel("bitwarden_autofill_service",
+                        AppResources.AutofillService, NotificationImportance.Low);
+                    notificationManager.CreateNotificationChannel(_notificationChannel);
+                }
+                builder.SetChannelId(_notificationChannel.Id);
+            }
+            if(/*Build.VERSION.SdkInt <= BuildVersionCodes.N && */_settingAutofillPersistNotification)
+            {
+                builder.SetPriority(-2);
+            }
+
+            _lastNotificationTime = now;
+            _lastNotificationUri = uri;
+            notificationManager.Notify(AutoFillNotificationId, builder.Build());
+            builder.Dispose();
+        }
+
+        private bool SkipPackage(string eventPackageName)
+        {
+            if(string.IsNullOrWhiteSpace(eventPackageName) ||
+                AccessibilityHelpers.FilteredPackageNames.Contains(eventPackageName) ||
+                eventPackageName.Contains("launcher"))
+            {
+                return true;
+            }
+            if(_launcherPackageNames == null || _lastLauncherSetBuilt == null ||
+                (DateTime.Now - _lastLauncherSetBuilt.Value) > _rebuildLauncherSpan)
+            {
+                // refresh launcher list every now and then
+                _lastLauncherSetBuilt = DateTime.Now;
+                var intent = new Intent(Intent.ActionMain);
+                intent.AddCategory(Intent.CategoryHome);
+                var resolveInfo = PackageManager.QueryIntentActivities(intent, 0);
+                _launcherPackageNames = resolveInfo.Select(ri => ri.ActivityInfo.PackageName).ToHashSet();
+            }
+            return _launcherPackageNames.Contains(eventPackageName);
+        }
+
+        private void LoadServices()
+        {
+            if(_storageService == null)
+            {
+                _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            }
+        }
+
+        private async Task LoadSettingsAsync()
+        {
+            var now = DateTime.UtcNow;
+            if(_lastSettingsReload == null || (now - _lastSettingsReload.Value) > _settingsReloadSpan)
+            {
+                _lastSettingsReload = now;
+                _settingAutofillPasswordField = await _storageService.GetAsync<bool>(
+                    Constants.AccessibilityAutofillPasswordFieldKey);
+                _settingAutofillPersistNotification = await _storageService.GetAsync<bool>(
+                    Constants.AccessibilityAutofillPersistNotificationKey);
+            }
+        }
+    }
+}

src/Android/Accessibility/Browser.cs

@@ -0,0 +1,23 @@
+using System;
+
+namespace Bit.Droid.Accessibility
+{
+    public class Browser
+    {
+        public Browser(string packageName, string uriViewId)
+        {
+            PackageName = packageName;
+            UriViewId = uriViewId;
+        }
+
+        public Browser(string packageName, string uriViewId, Func<string, string> getUriFunction)
+            : this(packageName, uriViewId)
+        {
+            GetUriFunction = getUriFunction;
+        }
+
+        public string PackageName { get; set; }
+        public string UriViewId { get; set; }
+        public Func<string, string> GetUriFunction { get; set; } = (s) => s;
+    }
+}

src/Android/Accessibility/Credentials.cs

@@ -1,6 +1,6 @@
-namespace Bit.Android
+namespace Bit.Droid.Accessibility
 {
-    public class AutofillCredentials
+    public class Credentials
     {
         public string Username { get; set; }
         public string Password { get; set; }

src/Android/Accessibility/NodeList.cs

@@ -0,0 +1,17 @@
+using Android.Views.Accessibility;
+using System;
+using System.Collections.Generic;
+
+namespace Bit.Droid.Accessibility
+{
+    public class NodeList : List<AccessibilityNodeInfo>, IDisposable
+    {
+        public void Dispose()
+        {
+            foreach(var item in this)
+            {
+                item.Dispose();
+            }
+        }
+    }
+}

src/Android/Assets/AboutAssets.txt

@@ -1,19 +0,0 @@
-Any raw assets you want to be deployed with your application can be placed in
-this directory (and child directories) and given a Build Action of "AndroidAsset".
-
-These files will be deployed with you package and will be accessible using Android's
-AssetManager, like this:
-
-public class ReadAsset : Activity
-{
-	protected override void OnCreate (Bundle bundle)
-	{
-		base.OnCreate (bundle);
-
-		InputStream input = Assets.Open ("my_asset.txt");
-	}
-}
-
-Additionally, some Android functions will automatically load asset files:
-
-Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");

src/Android/Autofill/AutofillHelpers.cs

@@ -0,0 +1,204 @@
+using System.Collections.Generic;
+using Android.Content;
+using Android.Service.Autofill;
+using Android.Widget;
+using System.Linq;
+using Android.App;
+using System.Threading.Tasks;
+using Bit.App.Resources;
+using Bit.Core.Enums;
+using Android.Views.Autofill;
+using Bit.Core.Abstractions;
+
+namespace Bit.Droid.Autofill
+{
+    public static class AutofillHelpers
+    {
+        private static int _pendingIntentId = 0;
+
+        // These browser work natively with the autofill framework
+        public static HashSet<string> TrustedBrowsers = new HashSet<string>
+        {
+            "org.mozilla.focus",
+            "org.mozilla.klar",
+            "com.duckduckgo.mobile.android",
+        };
+
+        // These browsers work using the compatibility shim for the autofill framework
+        public static HashSet<string> CompatBrowsers = new HashSet<string>
+        {
+            "org.mozilla.firefox",
+            "org.mozilla.firefox_beta",
+            "com.microsoft.emmx",
+            "com.android.chrome",
+            "com.chrome.beta",
+            "com.android.browser",
+            "com.brave.browser",
+            "com.opera.browser",
+            "com.opera.browser.beta",
+            "com.opera.mini.native",
+            "com.chrome.dev",
+            "com.chrome.canary",
+            "com.google.android.apps.chrome",
+            "com.google.android.apps.chrome_dev",
+            "com.yandex.browser",
+            "com.sec.android.app.sbrowser",
+            "com.sec.android.app.sbrowser.beta",
+            "org.codeaurora.swe.browser",
+            "com.amazon.cloud9",
+            "mark.via.gp",
+            "org.bromite.bromite",
+            "org.chromium.chrome",
+            "com.kiwibrowser.browser",
+            "com.ecosia.android",
+            "com.opera.mini.native.beta",
+            "org.mozilla.fennec_aurora",
+            "com.qwant.liberty",
+            "com.opera.touch",
+            "org.mozilla.fenix",
+            "org.mozilla.reference.browser",
+            "org.mozilla.rocket",
+        };
+
+        // The URLs are blacklisted from autofilling
+        public static HashSet<string> BlacklistedUris = new HashSet<string>
+        {
+            "androidapp://android",
+            "androidapp://com.x8bit.bitwarden",
+            "androidapp://com.oneplus.applocker",
+            "androidapp://com.android.settings",
+        };
+
+        public static async Task<List<FilledItem>> GetFillItemsAsync(Parser parser, ICipherService cipherService)
+        {
+            if(parser.FieldCollection.FillableForLogin)
+            {
+                var ciphers = await cipherService.GetAllDecryptedByUrlAsync(parser.Uri);
+                if(ciphers.Item1.Any() || ciphers.Item2.Any())
+                {
+                    var allCiphers = ciphers.Item1.ToList();
+                    allCiphers.AddRange(ciphers.Item2.ToList());
+                    return allCiphers.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 new List<FilledItem>();
+        }
+
+        public static FillResponse BuildFillResponse(Parser parser, List<FilledItem> items, bool locked)
+        {
+            var responseBuilder = new FillResponse.Builder();
+            if(items != null && items.Count > 0)
+            {
+                foreach(var item in items)
+                {
+                    var dataset = BuildDataset(parser.ApplicationContext, parser.FieldCollection, item);
+                    if(dataset != null)
+                    {
+                        responseBuilder.AddDataset(dataset);
+                    }
+                }
+            }
+            responseBuilder.AddDataset(BuildVaultDataset(parser.ApplicationContext, parser.FieldCollection,
+                parser.Uri, locked));
+            AddSaveInfo(parser, responseBuilder, parser.FieldCollection);
+            responseBuilder.SetIgnoredIds(parser.FieldCollection.IgnoreAutofillIds.ToArray());
+            return responseBuilder.Build();
+        }
+
+        public static Dataset BuildDataset(Context context, FieldCollection fields, FilledItem filledItem)
+        {
+            var datasetBuilder = new Dataset.Builder(
+                BuildListView(filledItem.Name, filledItem.Subtitle, filledItem.Icon, context));
+            if(filledItem.ApplyToFields(fields, datasetBuilder))
+            {
+                return datasetBuilder.Build();
+            }
+            return null;
+        }
+
+        public static Dataset BuildVaultDataset(Context context, FieldCollection fields, string uri, bool locked)
+        {
+            var intent = new Intent(context, typeof(MainActivity));
+            intent.PutExtra("autofillFramework", true);
+            if(fields.FillableForLogin)
+            {
+                intent.PutExtra("autofillFrameworkFillType", (int)CipherType.Login);
+            }
+            else if(fields.FillableForCard)
+            {
+                intent.PutExtra("autofillFrameworkFillType", (int)CipherType.Card);
+            }
+            else if(fields.FillableForIdentity)
+            {
+                intent.PutExtra("autofillFrameworkFillType", (int)CipherType.Identity);
+            }
+            else
+            {
+                return null;
+            }
+            intent.PutExtra("autofillFrameworkUri", uri);
+            var pendingIntent = PendingIntent.GetActivity(context, ++_pendingIntentId, intent,
+                PendingIntentFlags.CancelCurrent);
+
+            var view = BuildListView(
+                AppResources.AutofillWithBitwarden,
+                locked ? AppResources.VaultIsLocked : AppResources.GoToMyVault,
+                Resource.Drawable.icon,
+                context);
+
+            var datasetBuilder = new Dataset.Builder(view);
+            datasetBuilder.SetAuthentication(pendingIntent.IntentSender);
+
+            // Dataset must have a value set. We will reset this in the main activity when the real item is chosen.
+            foreach(var autofillId in fields.AutofillIds)
+            {
+                datasetBuilder.SetValue(autofillId, AutofillValue.ForText("PLACEHOLDER"));
+            }
+            return datasetBuilder.Build();
+        }
+
+        public static RemoteViews BuildListView(string text, string subtext, int iconId, Context context)
+        {
+            var packageName = context.PackageName;
+            var view = new RemoteViews(packageName, Resource.Layout.autofill_listitem);
+            view.SetTextViewText(Resource.Id.text1, text);
+            view.SetTextViewText(Resource.Id.text2, subtext);
+            view.SetImageViewResource(Resource.Id.icon, iconId);
+            return view;
+        }
+
+        public static void AddSaveInfo(Parser parser, FillResponse.Builder responseBuilder, FieldCollection fields)
+        {
+            // Docs state that password fields cannot be reliably saved in Compat mode since they will show as
+            // masked values.
+            var compatBrowser = CompatBrowsers.Contains(parser.PackageName);
+            if(compatBrowser && fields.SaveType == SaveDataType.Password)
+            {
+                return;
+            }
+
+            var requiredIds = fields.GetRequiredSaveFields();
+            if(fields.SaveType == SaveDataType.Generic || requiredIds.Length == 0)
+            {
+                return;
+            }
+
+            var saveBuilder = new SaveInfo.Builder(fields.SaveType, requiredIds);
+            var optionalIds = fields.GetOptionalSaveIds();
+            if(optionalIds.Length > 0)
+            {
+                saveBuilder.SetOptionalIds(optionalIds);
+            }
+            if(compatBrowser)
+            {
+                saveBuilder.SetFlags(SaveFlags.SaveOnAllViewsInvisible);
+            }
+            responseBuilder.SetSaveInfo(saveBuilder.Build());
+        }
+    }
+}

src/Android/Autofill/AutofillService.cs

@@ -0,0 +1,130 @@
+using Android;
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Service.Autofill;
+using Android.Widget;
+using Bit.Core;
+using Bit.Core.Abstractions;
+using Bit.Core.Enums;
+using Bit.Core.Utilities;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Bit.Droid.Autofill
+{
+    [Service(Permission = Manifest.Permission.BindAutofillService, Label = "Bitwarden")]
+    [IntentFilter(new string[] { "android.service.autofill.AutofillService" })]
+    [MetaData("android.autofill", Resource = "@xml/autofillservice")]
+    [Register("com.x8bit.bitwarden.Autofill.AutofillService")]
+    public class AutofillService : Android.Service.Autofill.AutofillService
+    {
+        private ICipherService _cipherService;
+        private ILockService _lockService;
+        private IStorageService _storageService;
+
+        public async override void OnFillRequest(FillRequest request, CancellationSignal cancellationSignal,
+            FillCallback callback)
+        {
+            var structure = request.FillContexts?.LastOrDefault()?.Structure;
+            if(structure == null)
+            {
+                return;
+            }
+
+            var parser = new Parser(structure, ApplicationContext);
+            parser.Parse();
+
+            if(_storageService == null)
+            {
+                _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            }
+
+            var shouldAutofill = await parser.ShouldAutofillAsync(_storageService);
+            if(!shouldAutofill)
+            {
+                return;
+            }
+
+            if(_lockService == null)
+            {
+                _lockService = ServiceContainer.Resolve<ILockService>("lockService");
+            }
+
+            List<FilledItem> items = null;
+            var locked = await _lockService.IsLockedAsync();
+            if(!locked)
+            {
+                if(_cipherService == null)
+                {
+                    _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
+                }
+                items = await AutofillHelpers.GetFillItemsAsync(parser, _cipherService);
+            }
+
+            // build response
+            var response = AutofillHelpers.BuildFillResponse(parser, items, locked);
+            callback.OnSuccess(response);
+        }
+
+        public async override void OnSaveRequest(SaveRequest request, SaveCallback callback)
+        {
+            var structure = request.FillContexts?.LastOrDefault()?.Structure;
+            if(structure == null)
+            {
+                return;
+            }
+
+            if(_storageService == null)
+            {
+                _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            }
+
+            var disableSavePrompt = await _storageService.GetAsync<bool?>(Constants.AutofillDisableSavePromptKey);
+            if(disableSavePrompt.GetValueOrDefault())
+            {
+                return;
+            }
+
+            var parser = new Parser(structure, ApplicationContext);
+            parser.Parse();
+
+            var savedItem = parser.FieldCollection.GetSavedItem();
+            if(savedItem == null)
+            {
+                Toast.MakeText(this, "Unable to save this form.", ToastLength.Short).Show();
+                return;
+            }
+
+            var intent = new Intent(this, typeof(MainActivity));
+            intent.SetFlags(ActivityFlags.NewTask | ActivityFlags.ClearTop);
+            intent.PutExtra("autofillFramework", true);
+            intent.PutExtra("autofillFrameworkSave", true);
+            intent.PutExtra("autofillFrameworkType", (int)savedItem.Type);
+            switch(savedItem.Type)
+            {
+                case CipherType.Login:
+                    intent.PutExtra("autofillFrameworkName", parser.Uri
+                        .Replace(Constants.AndroidAppProtocol, string.Empty)
+                        .Replace("https://", string.Empty)
+                        .Replace("http://", string.Empty));
+                    intent.PutExtra("autofillFrameworkUri", parser.Uri);
+                    intent.PutExtra("autofillFrameworkUsername", savedItem.Login.Username);
+                    intent.PutExtra("autofillFrameworkPassword", savedItem.Login.Password);
+                    break;
+                case CipherType.Card:
+                    intent.PutExtra("autofillFrameworkCardName", savedItem.Card.Name);
+                    intent.PutExtra("autofillFrameworkCardNumber", savedItem.Card.Number);
+                    intent.PutExtra("autofillFrameworkCardExpMonth", savedItem.Card.ExpMonth);
+                    intent.PutExtra("autofillFrameworkCardExpYear", savedItem.Card.ExpYear);
+                    intent.PutExtra("autofillFrameworkCardCode", savedItem.Card.Code);
+                    break;
+                default:
+                    Toast.MakeText(this, "Unable to save this type of form.", ToastLength.Short).Show();
+                    return;
+            }
+            StartActivity(intent);
+        }
+    }
+}

src/Android/Autofill/Field.cs

@@ -0,0 +1,195 @@
+using System.Collections.Generic;
+using System.Linq;
+using Android.Service.Autofill;
+using Android.Views;
+using Android.Views.Autofill;
+using static Android.App.Assist.AssistStructure;
+using Android.Text;
+using static Android.Views.ViewStructure;
+
+namespace Bit.Droid.Autofill
+{
+    public class Field
+    {
+        private List<string> _hints;
+
+        public Field(ViewNode node)
+        {
+            Id = node.Id;
+            TrackingId = $"{node.Id}_{node.GetHashCode()}";
+            IdEntry = node.IdEntry;
+            AutofillId = node.AutofillId;
+            AutofillType = node.AutofillType;
+            InputType = node.InputType;
+            Focused = node.IsFocused;
+            Selected = node.IsSelected;
+            Clickable = node.IsClickable;
+            Visible = node.Visibility == ViewStates.Visible;
+            Hints = FilterForSupportedHints(node.GetAutofillHints());
+            Hint = node.Hint;
+            AutofillOptions = node.GetAutofillOptions()?.ToList();
+            HtmlInfo = node.HtmlInfo;
+            Node = node;
+
+            if(node.AutofillValue != null)
+            {
+                if(node.AutofillValue.IsList)
+                {
+                    var autofillOptions = node.GetAutofillOptions();
+                    if(autofillOptions != null && autofillOptions.Length > 0)
+                    {
+                        ListValue = node.AutofillValue.ListValue;
+                        TextValue = autofillOptions[node.AutofillValue.ListValue];
+                    }
+                }
+                else if(node.AutofillValue.IsDate)
+                {
+                    DateValue = node.AutofillValue.DateValue;
+                }
+                else if(node.AutofillValue.IsText)
+                {
+                    TextValue = node.AutofillValue.TextValue;
+                }
+                else if(node.AutofillValue.IsToggle)
+                {
+                    ToggleValue = node.AutofillValue.ToggleValue;
+                }
+            }
+        }
+
+        public SaveDataType SaveType { get; set; } = SaveDataType.Generic;
+        public List<string> Hints
+        {
+            get => _hints;
+            set
+            {
+                _hints = value;
+                UpdateSaveTypeFromHints();
+            }
+        }
+        public string Hint { get; set; }
+        public int Id { get; private set; }
+        public string TrackingId { get; private set; }
+        public string IdEntry { get; set; }
+        public AutofillId AutofillId { get; private set; }
+        public AutofillType AutofillType { get; private set; }
+        public InputTypes InputType { get; private set; }
+        public bool Focused { get; private set; }
+        public bool Selected { get; private set; }
+        public bool Clickable { get; private set; }
+        public bool Visible { get; private set; }
+        public List<string> AutofillOptions { get; set; }
+        public string TextValue { get; set; }
+        public long? DateValue { get; set; }
+        public int? ListValue { get; set; }
+        public bool? ToggleValue { get; set; }
+        public HtmlInfo HtmlInfo { get; private set; }
+        public ViewNode Node { get; private set; }
+
+        public bool ValueIsNull()
+        {
+            return TextValue == null && DateValue == null && ToggleValue == null;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if(this == obj)
+            {
+                return true;
+            }
+            if(obj == null || GetType() != obj.GetType())
+            {
+                return false;
+            }
+            var field = obj as Field;
+            if(TextValue != null ? !TextValue.Equals(field.TextValue) : field.TextValue != null)
+            {
+                return false;
+            }
+            if(DateValue != null ? !DateValue.Equals(field.DateValue) : field.DateValue != null)
+            {
+                return false;
+            }
+            return ToggleValue != null ? ToggleValue.Equals(field.ToggleValue) : field.ToggleValue == null;
+        }
+
+        public override int GetHashCode()
+        {
+            var result = TextValue != null ? TextValue.GetHashCode() : 0;
+            result = 31 * result + (DateValue != null ? DateValue.GetHashCode() : 0);
+            result = 31 * result + (ToggleValue != null ? ToggleValue.GetHashCode() : 0);
+            return result;
+        }
+
+        private static List<string> FilterForSupportedHints(string[] hints)
+        {
+            return hints?.Where(h => IsValidHint(h)).ToList() ?? new List<string>();
+        }
+
+        private static bool IsValidHint(string hint)
+        {
+            switch(hint)
+            {
+                case View.AutofillHintCreditCardExpirationDate:
+                case View.AutofillHintCreditCardExpirationDay:
+                case View.AutofillHintCreditCardExpirationMonth:
+                case View.AutofillHintCreditCardExpirationYear:
+                case View.AutofillHintCreditCardNumber:
+                case View.AutofillHintCreditCardSecurityCode:
+                case View.AutofillHintEmailAddress:
+                case View.AutofillHintPhone:
+                case View.AutofillHintName:
+                case View.AutofillHintPassword:
+                case View.AutofillHintPostalAddress:
+                case View.AutofillHintPostalCode:
+                case View.AutofillHintUsername:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        private void UpdateSaveTypeFromHints()
+        {
+            SaveType = SaveDataType.Generic;
+            if(_hints == null)
+            {
+                return;
+            }
+
+            foreach(var hint in _hints)
+            {
+                switch(hint)
+                {
+                    case View.AutofillHintCreditCardExpirationDate:
+                    case View.AutofillHintCreditCardExpirationDay:
+                    case View.AutofillHintCreditCardExpirationMonth:
+                    case View.AutofillHintCreditCardExpirationYear:
+                    case View.AutofillHintCreditCardNumber:
+                    case View.AutofillHintCreditCardSecurityCode:
+                        SaveType |= SaveDataType.CreditCard;
+                        break;
+                    case View.AutofillHintEmailAddress:
+                        SaveType |= SaveDataType.EmailAddress;
+                        break;
+                    case View.AutofillHintPhone:
+                    case View.AutofillHintName:
+                        SaveType |= SaveDataType.Generic;
+                        break;
+                    case View.AutofillHintPassword:
+                        SaveType |= SaveDataType.Password;
+                        SaveType &= ~SaveDataType.EmailAddress;
+                        SaveType &= ~SaveDataType.Username;
+                        break;
+                    case View.AutofillHintPostalAddress:
+                    case View.AutofillHintPostalCode:
+                        SaveType |= SaveDataType.Address;
+                        break;
+                    case View.AutofillHintUsername:
+                        SaveType |= SaveDataType.Username;
+                        break;
+                }
+            }
+        }
+    }
+}

src/Android/Autofill/FieldCollection.cs

@@ -0,0 +1,342 @@
+using System.Collections.Generic;
+using Android.Service.Autofill;
+using Android.Views.Autofill;
+using System.Linq;
+using Android.Text;
+using Android.Views;
+
+namespace Bit.Droid.Autofill
+{
+    public class FieldCollection
+    {
+        private List<Field> _passwordFields = null;
+        private List<Field> _usernameFields = null;
+        private HashSet<string> _ignoreSearchTerms = new HashSet<string> { "search", "find", "recipient", "edit" };
+        private HashSet<string> _passwordTerms = new HashSet<string> { "password", "pswd" };
+
+        public List<AutofillId> AutofillIds { get; private set; } = new List<AutofillId>();
+        public SaveDataType SaveType
+        {
+            get
+            {
+                if(FillableForLogin)
+                {
+                    return SaveDataType.Password;
+                }
+                else if(FillableForCard)
+                {
+                    return SaveDataType.CreditCard;
+                }
+
+                return SaveDataType.Generic;
+            }
+        }
+        public HashSet<string> Hints { get; private set; } = new HashSet<string>();
+        public HashSet<string> FocusedHints { get; private set; } = new HashSet<string>();
+        public HashSet<string> FieldTrackingIds { get; private set; } = new HashSet<string>();
+        public List<Field> Fields { get; private set; } = new List<Field>();
+        public IDictionary<string, List<Field>> HintToFieldsMap { get; private set; } =
+            new Dictionary<string, List<Field>>();
+        public List<AutofillId> IgnoreAutofillIds { get; private set; } = new List<AutofillId>();
+
+        public List<Field> PasswordFields
+        {
+            get
+            {
+                if(_passwordFields != null)
+                {
+                    return _passwordFields;
+                }
+                if(Hints.Any())
+                {
+                    _passwordFields = new List<Field>();
+                    if(HintToFieldsMap.ContainsKey(View.AutofillHintPassword))
+                    {
+                        _passwordFields.AddRange(HintToFieldsMap[View.AutofillHintPassword]);
+                    }
+                }
+                else
+                {
+                    _passwordFields = Fields.Where(f => FieldIsPassword(f)).ToList();
+                    if(!_passwordFields.Any())
+                    {
+                        _passwordFields = Fields.Where(f => FieldHasPasswordTerms(f)).ToList();
+                    }
+                }
+                return _passwordFields;
+            }
+        }
+
+        public List<Field> UsernameFields
+        {
+            get
+            {
+                if(_usernameFields != null)
+                {
+                    return _usernameFields;
+                }
+                _usernameFields = new List<Field>();
+                if(Hints.Any())
+                {
+                    if(HintToFieldsMap.ContainsKey(View.AutofillHintEmailAddress))
+                    {
+                        _usernameFields.AddRange(HintToFieldsMap[View.AutofillHintEmailAddress]);
+                    }
+                    if(HintToFieldsMap.ContainsKey(View.AutofillHintUsername))
+                    {
+                        _usernameFields.AddRange(HintToFieldsMap[View.AutofillHintUsername]);
+                    }
+                }
+                else
+                {
+                    foreach(var passwordField in PasswordFields)
+                    {
+                        var usernameField = Fields.TakeWhile(f => f.AutofillId != passwordField.AutofillId)
+                            .LastOrDefault();
+                        if(usernameField != null)
+                        {
+                            _usernameFields.Add(usernameField);
+                        }
+                    }
+                }
+                return _usernameFields;
+            }
+        }
+
+        public bool FillableForLogin => FocusedHintsContain(new string[] {
+            View.AutofillHintUsername,
+            View.AutofillHintEmailAddress,
+            View.AutofillHintPassword
+        }) || UsernameFields.Any(f => f.Focused) || PasswordFields.Any(f => f.Focused);
+
+        public bool FillableForCard => FocusedHintsContain(new string[] {
+            View.AutofillHintCreditCardNumber,
+            View.AutofillHintCreditCardExpirationMonth,
+            View.AutofillHintCreditCardExpirationYear,
+            View.AutofillHintCreditCardSecurityCode
+        });
+
+        public bool FillableForIdentity => FocusedHintsContain(new string[] {
+            View.AutofillHintName,
+            View.AutofillHintPhone,
+            View.AutofillHintPostalAddress,
+            View.AutofillHintPostalCode
+        });
+
+        public bool Fillable => FillableForLogin || FillableForCard || FillableForIdentity;
+
+        public void Add(Field field)
+        {
+            if(field == null || FieldTrackingIds.Contains(field.TrackingId))
+            {
+                return;
+            }
+
+            _passwordFields = _usernameFields = null;
+            FieldTrackingIds.Add(field.TrackingId);
+            Fields.Add(field);
+            AutofillIds.Add(field.AutofillId);
+
+            if(field.Hints != null)
+            {
+                foreach(var hint in field.Hints)
+                {
+                    Hints.Add(hint);
+                    if(field.Focused)
+                    {
+                        FocusedHints.Add(hint);
+                    }
+                    if(!HintToFieldsMap.ContainsKey(hint))
+                    {
+                        HintToFieldsMap.Add(hint, new List<Field>());
+                    }
+                    HintToFieldsMap[hint].Add(field);
+                }
+            }
+        }
+
+        public SavedItem GetSavedItem()
+        {
+            if(SaveType == SaveDataType.Password)
+            {
+                var passwordField = PasswordFields.FirstOrDefault(f => !string.IsNullOrWhiteSpace(f.TextValue));
+                if(passwordField == null)
+                {
+                    return null;
+                }
+
+                var savedItem = new SavedItem
+                {
+                    Type = Core.Enums.CipherType.Login,
+                    Login = new SavedItem.LoginItem
+                    {
+                        Password = GetFieldValue(passwordField)
+                    }
+                };
+
+                var usernameField = Fields.TakeWhile(f => f.AutofillId != passwordField.AutofillId).LastOrDefault();
+                savedItem.Login.Username = GetFieldValue(usernameField);
+                return savedItem;
+            }
+            else if(SaveType == SaveDataType.CreditCard)
+            {
+                var savedItem = new SavedItem
+                {
+                    Type = Core.Enums.CipherType.Card,
+                    Card = new SavedItem.CardItem
+                    {
+                        Number = GetFieldValue(View.AutofillHintCreditCardNumber),
+                        Name = GetFieldValue(View.AutofillHintName),
+                        ExpMonth = GetFieldValue(View.AutofillHintCreditCardExpirationMonth, true),
+                        ExpYear = GetFieldValue(View.AutofillHintCreditCardExpirationYear),
+                        Code = GetFieldValue(View.AutofillHintCreditCardSecurityCode)
+                    }
+                };
+                return savedItem;
+            }
+            return null;
+        }
+
+        public AutofillId[] GetOptionalSaveIds()
+        {
+            if(SaveType == SaveDataType.Password)
+            {
+                return UsernameFields.Select(f => f.AutofillId).ToArray();
+            }
+            else if(SaveType == SaveDataType.CreditCard)
+            {
+                var fieldList = new List<Field>();
+                if(HintToFieldsMap.ContainsKey(View.AutofillHintCreditCardSecurityCode))
+                {
+                    fieldList.AddRange(HintToFieldsMap[View.AutofillHintCreditCardSecurityCode]);
+                }
+                if(HintToFieldsMap.ContainsKey(View.AutofillHintCreditCardExpirationYear))
+                {
+                    fieldList.AddRange(HintToFieldsMap[View.AutofillHintCreditCardExpirationYear]);
+                }
+                if(HintToFieldsMap.ContainsKey(View.AutofillHintCreditCardExpirationMonth))
+                {
+                    fieldList.AddRange(HintToFieldsMap[View.AutofillHintCreditCardExpirationMonth]);
+                }
+                if(HintToFieldsMap.ContainsKey(View.AutofillHintName))
+                {
+                    fieldList.AddRange(HintToFieldsMap[View.AutofillHintName]);
+                }
+                return fieldList.Select(f => f.AutofillId).ToArray();
+            }
+            return new AutofillId[0];
+        }
+
+        public AutofillId[] GetRequiredSaveFields()
+        {
+            if(SaveType == SaveDataType.Password)
+            {
+                return PasswordFields.Select(f => f.AutofillId).ToArray();
+            }
+            else if(SaveType == SaveDataType.CreditCard && HintToFieldsMap.ContainsKey(View.AutofillHintCreditCardNumber))
+            {
+                return HintToFieldsMap[View.AutofillHintCreditCardNumber].Select(f => f.AutofillId).ToArray();
+            }
+            return new AutofillId[0];
+        }
+
+        private bool FocusedHintsContain(IEnumerable<string> hints)
+        {
+            return hints.Any(h => FocusedHints.Contains(h));
+        }
+
+        private string GetFieldValue(string hint, bool monthValue = false)
+        {
+            if(HintToFieldsMap.ContainsKey(hint))
+            {
+                foreach(var field in HintToFieldsMap[hint])
+                {
+                    var val = GetFieldValue(field, monthValue);
+                    if(!string.IsNullOrWhiteSpace(val))
+                    {
+                        return val;
+                    }
+                }
+            }
+            return null;
+        }
+
+        private string GetFieldValue(Field field, bool monthValue = false)
+        {
+            if(field == null)
+            {
+                return null;
+            }
+            if(!string.IsNullOrWhiteSpace(field.TextValue))
+            {
+                if(field.AutofillType == AutofillType.List && field.ListValue.HasValue && monthValue)
+                {
+                    if(field.AutofillOptions.Count == 13)
+                    {
+                        return field.ListValue.ToString();
+                    }
+                    else if(field.AutofillOptions.Count == 12)
+                    {
+                        return (field.ListValue + 1).ToString();
+                    }
+                }
+                return field.TextValue;
+            }
+            else if(field.DateValue.HasValue)
+            {
+                return field.DateValue.Value.ToString();
+            }
+            else if(field.ToggleValue.HasValue)
+            {
+                return field.ToggleValue.Value.ToString();
+            }
+            return null;
+        }
+
+        private bool FieldIsPassword(Field f)
+        {
+            var inputTypePassword = f.InputType.HasFlag(InputTypes.TextVariationPassword) ||
+                f.InputType.HasFlag(InputTypes.TextVariationVisiblePassword) ||
+                f.InputType.HasFlag(InputTypes.TextVariationWebPassword);
+
+            // For whatever reason, multi-line input types are coming through with TextVariationPassword flags
+            if(inputTypePassword && f.InputType.HasFlag(InputTypes.TextVariationPassword) &&
+                f.InputType.HasFlag(InputTypes.TextFlagMultiLine))
+            {
+                inputTypePassword = false;
+            }
+
+            if(!inputTypePassword && f.HtmlInfo != null && f.HtmlInfo.Tag == "input" &&
+                (f.HtmlInfo.Attributes?.Any() ?? false))
+            {
+                foreach(var a in f.HtmlInfo.Attributes)
+                {
+                    var key = a.First as Java.Lang.String;
+                    var val = a.Second as Java.Lang.String;
+                    if(key != null && val != null && key.ToString() == "type" && val.ToString() == "password")
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return inputTypePassword && !ValueContainsAnyTerms(f.IdEntry, _ignoreSearchTerms) &&
+                !ValueContainsAnyTerms(f.Hint, _ignoreSearchTerms);
+        }
+
+        private bool FieldHasPasswordTerms(Field f)
+        {
+            return ValueContainsAnyTerms(f.IdEntry, _passwordTerms) || ValueContainsAnyTerms(f.Hint, _passwordTerms);
+        }
+
+        private bool ValueContainsAnyTerms(string value, HashSet<string> terms)
+        {
+            if(string.IsNullOrWhiteSpace(value))
+            {
+                return false;
+            }
+            var lowerValue = value.ToLowerInvariant();
+            return terms.Any(t => lowerValue.Contains(t));
+        }
+    }
+}

src/Android/Autofill/FilledItem.cs

@@ -0,0 +1,224 @@
+using Android.Service.Autofill;
+using Android.Views.Autofill;
+using System.Linq;
+using Bit.Core.Enums;
+using Android.Views;
+using Bit.Core.Models.View;
+
+namespace Bit.Droid.Autofill
+{
+    public class FilledItem
+    {
+        private string _password;
+        private string _cardName;
+        private string _cardNumber;
+        private string _cardExpMonth;
+        private string _cardExpYear;
+        private string _cardCode;
+        private string _idPhone;
+        private string _idEmail;
+        private string _idUsername;
+        private string _idAddress;
+        private string _idPostalCode;
+
+        public FilledItem(CipherView cipher)
+        {
+            Name = cipher.Name;
+            Type = cipher.Type;
+            Subtitle = cipher.SubTitle;
+
+            switch(Type)
+            {
+                case CipherType.Login:
+                    Icon = Resource.Drawable.login;
+                    _password = cipher.Login.Password;
+                    break;
+                case CipherType.Card:
+                    _cardNumber = cipher.Card.Number;
+                    Icon = Resource.Drawable.card;
+                    _cardName = cipher.Card.CardholderName;
+                    _cardCode = cipher.Card.Code;
+                    _cardExpMonth = cipher.Card.ExpMonth;
+                    _cardExpYear = cipher.Card.ExpYear;
+                    break;
+                case CipherType.Identity:
+                    Icon = Resource.Drawable.id;
+                    _idPhone = cipher.Identity.Phone;
+                    _idEmail = cipher.Identity.Email;
+                    _idUsername = cipher.Identity.Username;
+                    _idAddress = cipher.Identity.FullAddress;
+                    _idPostalCode = cipher.Identity.PostalCode;
+                    break;
+                default:
+                    Icon = Resource.Drawable.login;
+                    break;
+            }
+        }
+
+        public string Name { get; set; }
+        public string Subtitle { get; set; } = string.Empty;
+        public int Icon { get; set; } = Resource.Drawable.login;
+        public CipherType Type { get; set; }
+
+        public bool ApplyToFields(FieldCollection fieldCollection, Dataset.Builder datasetBuilder)
+        {
+            if(!fieldCollection?.Fields.Any() ?? true)
+            {
+                return false;
+            }
+
+            var setValues = false;
+            if(Type == CipherType.Login)
+            {
+                if(fieldCollection.PasswordFields.Any() && !string.IsNullOrWhiteSpace(_password))
+                {
+                    foreach(var f in fieldCollection.PasswordFields)
+                    {
+                        var val = ApplyValue(f, _password);
+                        if(val != null)
+                        {
+                            setValues = true;
+                            datasetBuilder.SetValue(f.AutofillId, val);
+                        }
+                    }
+                }
+                if(fieldCollection.UsernameFields.Any() && !string.IsNullOrWhiteSpace(Subtitle))
+                {
+                    foreach(var f in fieldCollection.UsernameFields)
+                    {
+                        var val = ApplyValue(f, Subtitle);
+                        if(val != null)
+                        {
+                            setValues = true;
+                            datasetBuilder.SetValue(f.AutofillId, val);
+                        }
+                    }
+                }
+            }
+            else if(Type == CipherType.Card)
+            {
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintCreditCardNumber,
+                    _cardNumber))
+                {
+                    setValues = true;
+                }
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintCreditCardSecurityCode,
+                    _cardCode))
+                {
+                    setValues = true;
+                }
+                if(ApplyValue(datasetBuilder, fieldCollection,
+                    Android.Views.View.AutofillHintCreditCardExpirationMonth, _cardExpMonth, true))
+                {
+                    setValues = true;
+                }
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintCreditCardExpirationYear,
+                    _cardExpYear))
+                {
+                    setValues = true;
+                }
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintName, _cardName))
+                {
+                    setValues = true;
+                }
+            }
+            else if(Type == CipherType.Identity)
+            {
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintPhone, _idPhone))
+                {
+                    setValues = true;
+                }
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintEmailAddress, _idEmail))
+                {
+                    setValues = true;
+                }
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintUsername,
+                    _idUsername))
+                {
+                    setValues = true;
+                }
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintPostalAddress,
+                    _idAddress))
+                {
+                    setValues = true;
+                }
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintPostalCode,
+                    _idPostalCode))
+                {
+                    setValues = true;
+                }
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintName, Subtitle))
+                {
+                    setValues = true;
+                }
+            }
+            return setValues;
+        }
+
+        private static bool ApplyValue(Dataset.Builder builder, FieldCollection fieldCollection,
+            string hint, string value, bool monthValue = false)
+        {
+            bool setValues = false;
+            if(fieldCollection.HintToFieldsMap.ContainsKey(hint) && !string.IsNullOrWhiteSpace(value))
+            {
+                foreach(var f in fieldCollection.HintToFieldsMap[hint])
+                {
+                    var val = ApplyValue(f, value, monthValue);
+                    if(val != null)
+                    {
+                        setValues = true;
+                        builder.SetValue(f.AutofillId, val);
+                    }
+                }
+            }
+            return setValues;
+        }
+
+        private static AutofillValue ApplyValue(Field field, string value, bool monthValue = false)
+        {
+            switch(field.AutofillType)
+            {
+                case AutofillType.Date:
+                    if(long.TryParse(value, out long dateValue))
+                    {
+                        return AutofillValue.ForDate(dateValue);
+                    }
+                    break;
+                case AutofillType.List:
+                    if(field.AutofillOptions != null)
+                    {
+                        if(monthValue && int.TryParse(value, out int monthIndex))
+                        {
+                            if(field.AutofillOptions.Count == 13)
+                            {
+                                return AutofillValue.ForList(monthIndex);
+                            }
+                            else if(field.AutofillOptions.Count >= monthIndex)
+                            {
+                                return AutofillValue.ForList(monthIndex - 1);
+                            }
+                        }
+                        for(var i = 0; i < field.AutofillOptions.Count; i++)
+                        {
+                            if(field.AutofillOptions[i].Equals(value))
+                            {
+                                return AutofillValue.ForList(i);
+                            }
+                        }
+                    }
+                    break;
+                case AutofillType.Text:
+                    return AutofillValue.ForText(value);
+                case AutofillType.Toggle:
+                    if(bool.TryParse(value, out bool toggleValue))
+                    {
+                        return AutofillValue.ForToggle(toggleValue);
+                    }
+                    break;
+                default:
+                    break;
+            }
+            return null;
+        }
+    }
+}

src/Android/Autofill/Parser.cs

@@ -0,0 +1,144 @@
+using static Android.App.Assist.AssistStructure;
+using Android.App.Assist;
+using System.Collections.Generic;
+using Bit.Core;
+using Android.Content;
+using Bit.Core.Abstractions;
+using System.Threading.Tasks;
+
+namespace Bit.Droid.Autofill
+{
+    public class Parser
+    {
+        public static HashSet<string> _excludedPackageIds = new HashSet<string>
+        {
+            "android"
+        };
+        private readonly AssistStructure _structure;
+        private string _uri;
+        private string _packageName;
+        private string _webDomain;
+
+        public Parser(AssistStructure structure, Context applicationContext)
+        {
+            _structure = structure;
+            ApplicationContext = applicationContext;
+        }
+
+        public Context ApplicationContext { get; set; }
+        public FieldCollection FieldCollection { get; private set; } = new FieldCollection();
+
+        public string Uri
+        {
+            get
+            {
+                if(!string.IsNullOrWhiteSpace(_uri))
+                {
+                    return _uri;
+                }
+                var webDomainNull = string.IsNullOrWhiteSpace(WebDomain);
+                if(webDomainNull && string.IsNullOrWhiteSpace(PackageName))
+                {
+                    _uri = null;
+                }
+                else if(!webDomainNull)
+                {
+                    _uri = string.Concat("http://", WebDomain);
+                }
+                else
+                {
+                    _uri = string.Concat(Constants.AndroidAppProtocol, PackageName);
+                }
+                return _uri;
+            }
+        }
+
+        public string PackageName
+        {
+            get => _packageName;
+            set
+            {
+                if(string.IsNullOrWhiteSpace(value))
+                {
+                    _packageName = _uri = null;
+                }
+                _packageName = value;
+            }
+        }
+
+        public string WebDomain
+        {
+            get => _webDomain;
+            set
+            {
+                if(string.IsNullOrWhiteSpace(value))
+                {
+                    _webDomain = _uri = null;
+                }
+                _webDomain = value;
+            }
+        }
+
+        public async Task<bool> ShouldAutofillAsync(IStorageService storageService)
+        {
+            var fillable = !string.IsNullOrWhiteSpace(Uri) && !AutofillHelpers.BlacklistedUris.Contains(Uri) &&
+                FieldCollection != null && FieldCollection.Fillable;
+            if(fillable)
+            {
+                var blacklistedUris = await storageService.GetAsync<List<string>>(Constants.AutofillBlacklistedUrisKey);
+                if(blacklistedUris != null && blacklistedUris.Count > 0)
+                {
+                    fillable = !new HashSet<string>(blacklistedUris).Contains(Uri);
+                }
+            }
+            return fillable;
+        }
+
+        public void Parse()
+        {
+            for(var i = 0; i < _structure.WindowNodeCount; i++)
+            {
+                var node = _structure.GetWindowNodeAt(i);
+                ParseNode(node.RootViewNode);
+            }
+            if(!AutofillHelpers.TrustedBrowsers.Contains(PackageName) &&
+                !AutofillHelpers.CompatBrowsers.Contains(PackageName))
+            {
+                WebDomain = null;
+            }
+        }
+
+        private void ParseNode(ViewNode node)
+        {
+            SetPackageAndDomain(node);
+            var hints = node.GetAutofillHints();
+            var isEditText = node.ClassName == "android.widget.EditText" || node?.HtmlInfo?.Tag == "input";
+            if(isEditText || (hints?.Length ?? 0) > 0)
+            {
+                FieldCollection.Add(new Field(node));
+            }
+            else
+            {
+                FieldCollection.IgnoreAutofillIds.Add(node.AutofillId);
+            }
+
+            for(var i = 0; i < node.ChildCount; i++)
+            {
+                ParseNode(node.GetChildAt(i));
+            }
+        }
+
+        private void SetPackageAndDomain(ViewNode node)
+        {
+            if(string.IsNullOrWhiteSpace(PackageName) && !string.IsNullOrWhiteSpace(node.IdPackage) &&
+                !_excludedPackageIds.Contains(node.IdPackage))
+            {
+                PackageName = node.IdPackage;
+            }
+            if(string.IsNullOrWhiteSpace(WebDomain) && !string.IsNullOrWhiteSpace(node.WebDomain))
+            {
+                WebDomain = node.WebDomain;
+            }
+        }
+    }
+}

src/Android/Autofill/SavedItem.cs

@@ -0,0 +1,26 @@
+using Bit.Core.Enums;
+
+namespace Bit.Droid.Autofill
+{
+    public class SavedItem
+    {
+        public CipherType Type { get; set; }
+        public LoginItem Login { get; set; }
+        public CardItem Card { get; set; }
+
+        public class LoginItem
+        {
+            public string Username { get; set; }
+            public string Password { get; set; }
+        }
+
+        public class CardItem
+        {
+            public string Name { get; set; }
+            public string Number { get; set; }
+            public string ExpMonth { get; set; }
+            public string ExpYear { get; set; }
+            public string Code { get; set; }
+        }
+    }
+}

src/Android/AutofillService.cs

@@ -1,317 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Android.AccessibilityServices;
-using Android.App;
-using Android.Content;
-using Android.OS;
-using Android.Views.Accessibility;
-
-namespace Bit.Android
-{
-    [Service(Permission = "android.permission.BIND_ACCESSIBILITY_SERVICE", Label = "bitwarden")]
-    [IntentFilter(new string[] { "android.accessibilityservice.AccessibilityService" })]
-    [MetaData("android.accessibilityservice", Resource = "@xml/accessibilityservice")]
-    public class AutofillService : AccessibilityService
-    {
-        private const int AutoFillNotificationId = 34573;
-        private const string SystemUiPackage = "com.android.systemui";
-        private const string BitwardenPackage = "com.x8bit.bitwarden";
-        private const string BitwardenWebsite = "bitwarden.com";
-
-        private static Dictionary<string, Browser> SupportedBrowsers => new List<Browser>
-        {
-            new Browser("com.android.chrome", "url_bar"),
-            new Browser("com.chrome.beta", "url_bar"),
-            new Browser("com.android.browser", "url"),
-            new Browser("com.brave.browser", "url_bar"),
-            new Browser("com.opera.browser", "url_field"),
-            new Browser("com.opera.browser.beta", "url_field"),
-            new Browser("com.opera.mini.native", "url_field"),
-            new Browser("com.chrome.dev", "url_bar"),
-            new Browser("com.chrome.canary", "url_bar"),
-            new Browser("com.google.android.apps.chrome", "url_bar"),
-            new Browser("com.google.android.apps.chrome_dev", "url_bar"),
-            new Browser("org.iron.srware", "url_bar"),
-            new Browser("com.sec.android.app.sbrowser", "sbrowser_url_bar"),
-            new Browser("com.yandex.browser", "bro_omnibar_address_title_text",
-                (s) => s.Split(' ').FirstOrDefault()),
-            new Browser("org.mozilla.firefox", "url_bar_title"),
-            new Browser("org.mozilla.firefox_beta", "url_bar_title"),
-            new Browser("com.ghostery.android.ghostery", "search_field"),
-            new Browser("org.adblockplus.browser", "url_bar_title"),
-            new Browser("com.htc.sense.browser", "title"),
-            new Browser("com.amazon.cloud9", "url"),
-            new Browser("mobi.mgeek.TunnyBrowser", "title"),
-            new Browser("com.nubelacorp.javelin", "enterUrl"),
-            new Browser("com.jerky.browser2", "enterUrl"),
-            new Browser("com.mx.browser", "address_editor_with_progress"),
-            new Browser("com.mx.browser.tablet", "address_editor_with_progress"),
-            new Browser("com.linkbubble.playstore", "url_text"),
-            new Browser("com.ksmobile.cb", "address_bar_edit_text")
-        }.ToDictionary(n => n.PackageName);
-
-        public override void OnAccessibilityEvent(AccessibilityEvent e)
-        {
-            var root = RootInActiveWindow;
-            if(string.IsNullOrWhiteSpace(e.PackageName) || e.PackageName == SystemUiPackage ||
-                root?.PackageName != e.PackageName)
-            {
-                return;
-            }
-
-            /*
-            var testNodes = GetWindowNodes(root, e, n => n.ViewIdResourceName != null && n.Text != null, false);
-            var testNodesData = testNodes.Select(n => new { id = n.ViewIdResourceName, text = n.Text });
-            testNodes.Dispose();
-            testNodes = null;
-            */
-
-            var notificationManager = ((NotificationManager)GetSystemService(NotificationService));
-            switch(e.EventType)
-            {
-                case EventTypes.WindowContentChanged:
-                case EventTypes.WindowStateChanged:
-                    var cancelNotification = true;
-
-                    if(e.PackageName == BitwardenPackage)
-                    {
-                        notificationManager.Cancel(AutoFillNotificationId);
-                        break;
-                    }
-
-                    var passwordNodes = GetWindowNodes(root, e, n => n.Password, false);
-                    if(passwordNodes.Count > 0)
-                    {
-                        var uri = GetUri(root);
-                        if(uri != null && !uri.Contains(BitwardenWebsite))
-                        {
-                            if(NeedToAutofill(AutofillActivity.LastCredentials, uri))
-                            {
-                                var allEditTexts = GetWindowNodes(root, e, n => EditText(n), false);
-                                var usernameEditText = allEditTexts.TakeWhile(n => !n.Password).LastOrDefault();
-                                FillCredentials(usernameEditText, passwordNodes);
-
-                                allEditTexts.Dispose();
-                                allEditTexts = null;
-                                usernameEditText.Dispose();
-                                usernameEditText = null;
-                            }
-                            else
-                            {
-                                NotifyToAutofill(uri, notificationManager);
-                                cancelNotification = false;
-                            }
-                        }
-
-                        AutofillActivity.LastCredentials = null;
-                    }
-
-                    passwordNodes.Dispose();
-                    passwordNodes = null;
-
-                    if(cancelNotification)
-                    {
-                        notificationManager.Cancel(AutoFillNotificationId);
-                    }
-                    break;
-                default:
-                    break;
-            }
-
-            notificationManager.Dispose();
-            notificationManager = null;
-            root.Dispose();
-            root = null;
-            e.Dispose();
-        }
-
-        public override void OnInterrupt()
-        {
-
-        }
-
-        private string GetUri(AccessibilityNodeInfo root)
-        {
-            var uri = string.Concat(App.Constants.AndroidAppProtocol, root.PackageName);
-            if(SupportedBrowsers.ContainsKey(root.PackageName))
-            {
-                var addressNode = root.FindAccessibilityNodeInfosByViewId(
-                    $"{root.PackageName}:id/{SupportedBrowsers[root.PackageName].UriViewId}").FirstOrDefault();
-                if(addressNode != null)
-                {
-                    uri = ExtractUri(uri, addressNode, SupportedBrowsers[root.PackageName]);
-                    addressNode.Dispose();
-                    addressNode = null;
-                }
-            }
-
-            return uri;
-        }
-
-        private string ExtractUri(string uri, AccessibilityNodeInfo addressNode, Browser browser)
-        {
-            if(addressNode?.Text != null)
-            {
-                uri = browser.GetUriFunction(addressNode.Text).Trim();
-                if(uri != null && uri.Contains("."))
-                {
-                    if(!uri.Contains("://") && !uri.Contains(" "))
-                    {
-                        uri = string.Concat("http://", uri);
-                    }
-                    else if(Build.VERSION.SdkInt <= BuildVersionCodes.KitkatWatch)
-                    {
-                        var parts = uri.Split(new string[] { ". " }, StringSplitOptions.None);
-                        if(parts.Length > 1)
-                        {
-                            var urlPart = parts.FirstOrDefault(p => p.StartsWith("http"));
-                            if(urlPart != null)
-                            {
-                                uri = urlPart.Trim();
-                            }
-                        }
-                    }
-                }
-            }
-
-            return uri;
-        }
-
-        /// <summary>
-        /// Check to make sure it is ok to autofill still on the current screen
-        /// </summary>
-        private bool NeedToAutofill(AutofillCredentials creds, string currentUriString)
-        {
-            if(creds == null)
-            {
-                return false;
-            }
-
-            Uri lastUri, currentUri;
-            if(Uri.TryCreate(creds.LastUri, UriKind.Absolute, out lastUri) &&
-                Uri.TryCreate(currentUriString, UriKind.Absolute, out currentUri) &&
-                lastUri.Host == currentUri.Host)
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        private static bool EditText(AccessibilityNodeInfo n)
-        {
-            return n.ClassName != null && n.ClassName.Contains("EditText");
-        }
-
-        private void NotifyToAutofill(string uri, NotificationManager notificationManager)
-        {
-            var intent = new Intent(this, typeof(AutofillActivity));
-            intent.PutExtra("uri", uri);
-            intent.SetFlags(ActivityFlags.NewTask | ActivityFlags.SingleTop | ActivityFlags.ClearTop);
-            var pendingIntent = PendingIntent.GetActivity(this, 0, intent, PendingIntentFlags.UpdateCurrent);
-
-            var builder = new Notification.Builder(this);
-            builder.SetSmallIcon(Resource.Drawable.notification_sm)
-                   .SetContentTitle(App.Resources.AppResources.BitwardenAutofillService)
-                   .SetContentText(App.Resources.AppResources.BitwardenAutofillServiceNotificationContent)
-                   .SetTicker(App.Resources.AppResources.BitwardenAutofillServiceNotificationContent)
-                   .SetWhen(Java.Lang.JavaSystem.CurrentTimeMillis())
-                   .SetContentIntent(pendingIntent);
-
-            if(Build.VERSION.SdkInt > BuildVersionCodes.KitkatWatch)
-            {
-                builder.SetVisibility(NotificationVisibility.Secret)
-                    .SetColor(global::Android.Support.V4.Content.ContextCompat.GetColor(ApplicationContext,
-                        Resource.Color.primary));
-            }
-
-            notificationManager.Notify(AutoFillNotificationId, builder.Build());
-
-            builder.Dispose();
-            builder = null;
-        }
-
-        private void FillCredentials(AccessibilityNodeInfo usernameNode, IEnumerable<AccessibilityNodeInfo> passwordNodes)
-        {
-            FillEditText(usernameNode, AutofillActivity.LastCredentials.Username);
-            foreach(var n in passwordNodes)
-            {
-                FillEditText(n, AutofillActivity.LastCredentials.Password);
-            }
-        }
-
-        private static void FillEditText(AccessibilityNodeInfo editTextNode, string value)
-        {
-            if(editTextNode == null || value == null)
-            {
-                return;
-            }
-
-            var bundle = new Bundle();
-            bundle.PutString(AccessibilityNodeInfo.ActionArgumentSetTextCharsequence, value);
-            editTextNode.PerformAction(global::Android.Views.Accessibility.Action.SetText, bundle);
-        }
-
-        private NodeList GetWindowNodes(AccessibilityNodeInfo n, AccessibilityEvent e,
-            Func<AccessibilityNodeInfo, bool> condition, bool disposeIfUnused, NodeList nodes = null)
-        {
-            if(nodes == null)
-            {
-                nodes = new NodeList();
-            }
-
-            if(n != null)
-            {
-                var dispose = disposeIfUnused;
-                if(n.WindowId == e.WindowId && !(n.ViewIdResourceName?.StartsWith(SystemUiPackage) ?? false) && condition(n))
-                {
-                    dispose = false;
-                    nodes.Add(n);
-                }
-
-                for(var i = 0; i < n.ChildCount; i++)
-                {
-                    GetWindowNodes(n.GetChild(i), e, condition, true, nodes);
-                }
-
-                if(dispose)
-                {
-                    n.Dispose();
-                }
-            }
-
-            return nodes;
-        }
-
-        public class Browser
-        {
-            public Browser(string packageName, string uriViewId)
-            {
-                PackageName = packageName;
-                UriViewId = uriViewId;
-            }
-
-            public Browser(string packageName, string uriViewId, Func<string, string> getUriFunction)
-                : this(packageName, uriViewId)
-            {
-                GetUriFunction = getUriFunction;
-            }
-
-            public string PackageName { get; set; }
-            public string UriViewId { get; set; }
-            public Func<string, string> GetUriFunction { get; set; } = (s) => s;
-        }
-
-        public class NodeList : List<AccessibilityNodeInfo>, IDisposable
-        {
-            public void Dispose()
-            {
-                foreach(var item in this)
-                {
-                    item.Dispose();
-                }
-            }
-        }
-    }
-}

src/Android/Controls/CustomButtonRenderer.cs

@@ -1,26 +0,0 @@
-using System;
-using System.ComponentModel;
-using Bit.Android.Controls;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(Button), typeof(CustomButtonRenderer))]
-namespace Bit.Android.Controls
-{
-    public class CustomButtonRenderer : ButtonRenderer
-    {
-        protected override void OnElementChanged(ElementChangedEventArgs<Button> e)
-        {
-            base.OnElementChanged(e);
-            if(Control.TextSize == (float)Device.GetNamedSize(NamedSize.Default, typeof(Button)))
-            {
-                Control.TextSize = (float)Device.GetNamedSize(NamedSize.Medium, typeof(Button));
-            }
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            base.OnElementPropertyChanged(sender, e);
-        }
-    }
-}

src/Android/Controls/CustomSearchBarRenderer.cs

@@ -1,18 +0,0 @@
-using System;
-using System.ComponentModel;
-using Bit.Android.Controls;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(SearchBar), typeof(CustomSearchBarRenderer))]
-namespace Bit.Android.Controls
-{
-    public class CustomSearchBarRenderer : SearchBarRenderer
-    {
-        protected override void OnElementChanged(ElementChangedEventArgs<SearchBar> e)
-        {
-            base.OnElementChanged(e);
-            Control.SetPadding((int)global::Android.App.Application.Context.ToPixels(-8), 0, 0, 0);
-        }
-    }
-}

src/Android/Controls/ExtendedButtonRenderer.cs

@@ -1,62 +0,0 @@
-using System;
-using System.ComponentModel;
-using Bit.Android.Controls;
-using Bit.App.Controls;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(ExtendedButton), typeof(ExtendedButtonRenderer))]
-namespace Bit.Android.Controls
-{
-    public class ExtendedButtonRenderer : CustomButtonRenderer
-    {
-        protected override void OnElementChanged(ElementChangedEventArgs<Button> e)
-        {
-            base.OnElementChanged(e);
-            SetPadding();
-            SetUppercase();
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            base.OnElementPropertyChanged(sender, e);
-            if(e.PropertyName == ExtendedButton.PaddingProperty.PropertyName)
-            {
-                SetPadding();
-            }
-            else if(e.PropertyName == ExtendedButton.UppercaseProperty.PropertyName)
-            {
-                SetUppercase();
-            }
-        }
-
-        private void SetPadding()
-        {
-            var element = Element as ExtendedButton;
-            if(element != null)
-            {
-                Control.SetPadding(
-                    (int)element.Padding.Left,
-                    (int)element.Padding.Top,
-                    (int)element.Padding.Right,
-                    (int)element.Padding.Bottom);
-            }
-        }
-
-        private void SetUppercase()
-        {
-            var element = Element as ExtendedButton;
-            if(element != null && !string.IsNullOrWhiteSpace(element.Text))
-            {
-                if(element.Uppercase)
-                {
-                    element.Text = element.Text.ToUpperInvariant();
-                }
-                else
-                {
-                    Control.TransformationMethod = null;
-                }
-            }
-        }
-    }
-}

src/Android/Controls/ExtendedEditorRenderer.cs

@@ -1,48 +0,0 @@
-using System;
-using System.ComponentModel;
-using Bit.Android.Controls;
-using Bit.App.Controls;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(ExtendedEditor), typeof(ExtendedEditorRenderer))]
-namespace Bit.Android.Controls
-{
-    public class ExtendedEditorRenderer : EditorRenderer
-    {
-        protected override void OnElementChanged(ElementChangedEventArgs<Editor> e)
-        {
-            base.OnElementChanged(e);
-
-            var view = (ExtendedEditor)Element;
-
-            SetBorder(view);
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            var view = (ExtendedEditor)Element;
-
-            if(e.PropertyName == ExtendedEditor.HasBorderProperty.PropertyName)
-            {
-                SetBorder(view);
-            }
-            else
-            {
-                base.OnElementPropertyChanged(sender, e);
-                if(e.PropertyName == VisualElement.BackgroundColorProperty.PropertyName)
-                {
-                    Control.SetBackgroundColor(view.BackgroundColor.ToAndroid());
-                }
-            }
-        }
-
-        private void SetBorder(ExtendedEditor view)
-        {
-            if(!view.HasBorder)
-            {
-                Control.SetBackgroundColor(global::Android.Graphics.Color.Transparent);
-            }
-        }
-    }
-}

src/Android/Controls/ExtendedEntryRenderer.cs

@@ -1,197 +0,0 @@
-using System;
-using System.ComponentModel;
-using Android.Graphics;
-using Android.Text;
-using Android.Text.Method;
-using Android.Views.InputMethods;
-using Android.Widget;
-using Bit.Android.Controls;
-using Bit.App.Controls;
-using Bit.App.Enums;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(ExtendedEntry), typeof(ExtendedEntryRenderer))]
-namespace Bit.Android.Controls
-{
-    public class ExtendedEntryRenderer : EntryRenderer
-    {
-        private bool _isPassword;
-        private bool _toggledPassword;
-        private bool _isDisposed;
-        private ExtendedEntry _view;
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Entry> e)
-        {
-            base.OnElementChanged(e);
-
-            _view = (ExtendedEntry)Element;
-            _isPassword = _view.IsPassword;
-
-            if(Control != null)
-            {
-                Control.SetIncludeFontPadding(false);
-                if(e.NewElement != null && e.NewElement.IsPassword)
-                {
-                    Control.SetTypeface(Typeface.Default, TypefaceStyle.Normal);
-                    Control.TransformationMethod = new PasswordTransformationMethod();
-                }
-            }
-
-            SetBorder(_view);
-            SetMaxLength(_view);
-            SetReturnType(_view);
-
-            // Editor Action is called when the return button is pressed
-            Control.EditorAction += Control_EditorAction;
-
-            if(_view.DisableAutocapitalize)
-            {
-                Control.SetRawInputType(Control.InputType |= InputTypes.TextVariationEmailAddress);
-            }
-
-            if(_view.Autocorrect.HasValue)
-            {
-                Control.SetRawInputType(Control.InputType |= InputTypes.TextFlagNoSuggestions);
-            }
-
-            _view.ToggleIsPassword += ToggleIsPassword;
-
-            if(_view.FontFamily == "monospace")
-            {
-                Control.Typeface = Typeface.Monospace;
-            }
-        }
-
-        private void ToggleIsPassword(object sender, EventArgs e)
-        {
-            var cursorStart = Control.SelectionStart;
-            var cursorEnd = Control.SelectionEnd;
-
-            Control.TransformationMethod = _isPassword ? null : new PasswordTransformationMethod();
-
-            // set focus
-            Control.RequestFocus();
-
-            if(_toggledPassword)
-            {
-                // restore cursor position
-                Control.SetSelection(cursorStart, cursorEnd);
-            }
-            else
-            {
-                // set cursor to end
-                Control.SetSelection(Control.Text.Length);
-            }
-
-            // show keyboard
-            var app = XLabs.Ioc.Resolver.Resolve<global::Android.App.Application>();
-            var inputMethodManager =
-                app.GetSystemService(global::Android.Content.Context.InputMethodService) as InputMethodManager;
-            inputMethodManager.ShowSoftInput(Control, ShowFlags.Forced);
-            inputMethodManager.ToggleSoftInput(ShowFlags.Forced, HideSoftInputFlags.ImplicitOnly);
-
-            _isPassword = _view.IsPasswordFromToggled = !_isPassword;
-            _toggledPassword = true;
-        }
-
-        private void Control_EditorAction(object sender, TextView.EditorActionEventArgs e)
-        {
-            if(_view.ReturnType != ReturnType.Next)
-            {
-                _view.Unfocus();
-            }
-
-            // Call all the methods attached to base_entry event handler Completed
-            _view.InvokeCompleted();
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            var view = (ExtendedEntry)Element;
-
-            if(e.PropertyName == ExtendedEntry.HasBorderProperty.PropertyName
-                || e.PropertyName == ExtendedEntry.HasOnlyBottomBorderProperty.PropertyName
-                || e.PropertyName == ExtendedEntry.BottomBorderColorProperty.PropertyName)
-            {
-                SetBorder(view);
-            }
-            else
-            {
-                base.OnElementPropertyChanged(sender, e);
-                if(e.PropertyName == VisualElement.BackgroundColorProperty.PropertyName)
-                {
-                    Control.SetBackgroundColor(view.BackgroundColor.ToAndroid());
-                }
-            }
-
-            if(view.FontFamily == "monospace")
-            {
-                Control.Typeface = Typeface.Monospace;
-            }
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if(_isDisposed)
-            {
-                return;
-            }
-
-            _isDisposed = true;
-            if(disposing && Control != null)
-            {
-                _view.ToggleIsPassword -= ToggleIsPassword;
-                Control.EditorAction -= Control_EditorAction;
-            }
-
-            base.Dispose(disposing);
-        }
-
-        private void SetReturnType(ExtendedEntry view)
-        {
-            if(view.ReturnType.HasValue)
-            {
-                switch(view.ReturnType.Value)
-                {
-                    case ReturnType.Go:
-                        Control.ImeOptions = ImeAction.Go;
-                        Control.SetImeActionLabel("Go", ImeAction.Go);
-                        break;
-                    case ReturnType.Next:
-                        Control.ImeOptions = ImeAction.Next;
-                        Control.SetImeActionLabel("Next", ImeAction.Next);
-                        break;
-                    case ReturnType.Search:
-                        Control.ImeOptions = ImeAction.Search;
-                        Control.SetImeActionLabel("Search", ImeAction.Search);
-                        break;
-                    case ReturnType.Send:
-                        Control.ImeOptions = ImeAction.Send;
-                        Control.SetImeActionLabel("Send", ImeAction.Send);
-                        break;
-                    default:
-                        Control.SetImeActionLabel("Done", ImeAction.Done);
-                        break;
-                }
-            }
-        }
-
-        private void SetBorder(ExtendedEntry view)
-        {
-            if(!view.HasBorder)
-            {
-                Control.SetBackgroundColor(global::Android.Graphics.Color.Transparent);
-            }
-            else
-            {
-                Control.SetBackgroundColor(view.BottomBorderColor.ToAndroid());
-            }
-        }
-
-        private void SetMaxLength(ExtendedEntry view)
-        {
-            Control.SetFilters(new IInputFilter[] { new InputFilterLengthFilter(view.MaxLength) });
-        }
-    }
-}

src/Android/Controls/ExtendedPickerRenderer.cs

@@ -1,49 +0,0 @@
-using System;
-using System.ComponentModel;
-using Bit.Android.Controls;
-using Bit.App.Controls;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(ExtendedPicker), typeof(ExtendedPickerRenderer))]
-namespace Bit.Android.Controls
-{
-    public class ExtendedPickerRenderer : PickerRenderer
-    {
-        protected override void OnElementChanged(ElementChangedEventArgs<Picker> e)
-        {
-            base.OnElementChanged(e);
-
-            var view = (ExtendedPicker)Element;
-
-            Control.TextSize = (float)Device.GetNamedSize(NamedSize.Medium, typeof(Picker));
-            SetBorder(view);
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            var view = (ExtendedPicker)Element;
-
-            if(e.PropertyName == ExtendedPicker.HasBorderProperty.PropertyName)
-            {
-                SetBorder(view);
-            }
-            else
-            {
-                base.OnElementPropertyChanged(sender, e);
-                if(e.PropertyName == VisualElement.BackgroundColorProperty.PropertyName)
-                {
-                    Control.SetBackgroundColor(view.BackgroundColor.ToAndroid());
-                }
-            }
-        }
-
-        private void SetBorder(ExtendedPicker view)
-        {
-            if(!view.HasBorder)
-            {
-                Control.SetBackgroundColor(global::Android.Graphics.Color.Transparent);
-            }
-        }
-    }
-}

src/Android/Controls/ExtendedSwitchCellRenderer.cs

@@ -1,72 +0,0 @@
-using Android.Content;
-using System.ComponentModel;
-using Android.Views;
-using Bit.Android.Controls;
-using Bit.App.Controls;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-using AView = Android.Views.View;
-using Android.Widget;
-
-[assembly: ExportRenderer(typeof(ExtendedSwitchCell), typeof(ExtendedSwitchCellRenderer))]
-namespace Bit.Android.Controls
-{
-    public class ExtendedSwitchCellRenderer : SwitchCellRenderer
-    {
-        protected BaseCellView View { get; private set; }
-
-        protected override AView GetCellCore(Cell item, AView convertView, ViewGroup parent, Context context)
-        {
-            var View = base.GetCellCore(item, convertView, parent, context) as SwitchCellView;
-            var extendedCell = (ExtendedSwitchCell)item;
-
-            if(View != null)
-            {
-                if(extendedCell.BackgroundColor != Color.White)
-                {
-                    View.SetBackgroundColor(extendedCell.BackgroundColor.ToAndroid());
-                }
-                else
-                {
-                    View.SetBackgroundResource(Resource.Drawable.list_selector);
-                }
-
-                if(item.IsEnabled)
-                {
-                    View.SetMainTextColor(Color.Black);
-                }
-                else
-                {
-                    View.SetMainTextColor(Color.FromHex("777777"));
-                }
-
-                if(View.ChildCount > 1)
-                {
-                    var layout = View.GetChildAt(1) as LinearLayout;
-                    if(layout != null && layout.ChildCount > 0)
-                    {
-                        var textView = layout.GetChildAt(0) as TextView;
-                        if(textView != null)
-                        {
-                            textView.TextSize = (float)Device.GetNamedSize(NamedSize.Medium, typeof(Label));
-                        }
-                    }
-                }
-            }
-
-            return View;
-        }
-
-        protected override void OnCellPropertyChanged(object sender, PropertyChangedEventArgs args)
-        {
-            base.OnCellPropertyChanged(sender, args);
-
-            var cell = (ExtendedSwitchCell)Cell;
-
-            if(args.PropertyName == ExtendedSwitchCell.BackgroundColorProperty.PropertyName)
-            {
-                View.SetBackgroundColor(cell.BackgroundColor.ToAndroid());
-            }
-        }
-    }
-}

src/Android/Controls/ExtendedTabbedPageRenderer.cs

@@ -1,95 +0,0 @@
-using System;
-using Bit.Android.Controls;
-using Bit.App.Controls;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-using Android.Support.Design.Widget;
-using Xamarin.Forms.Platform.Android.AppCompat;
-using System.Reflection;
-using System.Linq;
-
-[assembly: ExportRenderer(typeof(ExtendedTabbedPage), typeof(ExtendedTabbedPageRenderer))]
-namespace Bit.Android.Controls
-{
-    public class ExtendedTabbedPageRenderer : TabbedPageRenderer, TabLayout.IOnTabSelectedListener
-    {
-        private TabLayout _tabLayout;
-
-        protected override void OnElementChanged(ElementChangedEventArgs<TabbedPage> e)
-        {
-            base.OnElementChanged(e);
-            var view = (ExtendedTabbedPage)Element;
-
-            var field = typeof(ExtendedTabbedPageRenderer).BaseType.GetField("_tabLayout",
-                BindingFlags.Instance | BindingFlags.NonPublic);
-            _tabLayout = field?.GetValue(this) as TabLayout;
-            if(_tabLayout != null)
-            {
-                var tab = _tabLayout.GetTabAt(0);
-                SetSelectedTabIcon(tab, Element.Children[0].Icon, true);
-            }
-        }
-
-        void TabLayout.IOnTabSelectedListener.OnTabSelected(TabLayout.Tab tab)
-        {
-            if(Element == null)
-            {
-                return;
-            }
-
-            var selectedIndex = tab.Position;
-            var child = Element.Children[selectedIndex];
-            if(Element.Children.Count > selectedIndex && selectedIndex >= 0)
-            {
-                Element.CurrentPage = Element.Children[selectedIndex];
-            }
-
-            SetSelectedTabIcon(tab, child.Icon, true);
-        }
-
-        void TabLayout.IOnTabSelectedListener.OnTabUnselected(TabLayout.Tab tab)
-        {
-            var child = Element.Children[tab.Position];
-            SetSelectedTabIcon(tab, child.Icon, false);
-        }
-
-        private void SetSelectedTabIcon(TabLayout.Tab tab, string icon, bool selected)
-        {
-            if(string.IsNullOrEmpty(icon))
-            {
-                return;
-            }
-
-            if(selected)
-            {
-                var selectedResource = IdFromTitle(string.Format("{0}_selected", icon), ResourceManager.DrawableClass);
-                if(selectedResource != 0)
-                {
-                    tab.SetIcon(selectedResource);
-                    return;
-                }
-            }
-
-            var resource = IdFromTitle(icon, ResourceManager.DrawableClass);
-            tab.SetIcon(resource);
-        }
-
-        private int IdFromTitle(string title, Type type)
-        {
-            var name = System.IO.Path.GetFileNameWithoutExtension(title);
-            return GetId(type, name);
-        }
-
-        private int GetId(Type type, string propertyName)
-        {
-            var props = type.GetFields();
-            var prop = props.FirstOrDefault(p => p.Name == propertyName);
-            if(prop != null)
-            {
-                return (int)prop.GetValue(type);
-            }
-
-            return 0;
-        }
-    }
-}

src/Android/Controls/ExtendedTableViewRenderer.cs

@@ -1,165 +0,0 @@
-using System;
-using Android.Widget;
-using Bit.Android.Controls;
-using Bit.App.Controls;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-using Android.Content;
-using AView = Android.Views.View;
-using AListView = Android.Widget.ListView;
-using Android.Views;
-
-[assembly: ExportRenderer(typeof(ExtendedTableView), typeof(ExtendedTableViewRenderer))]
-namespace Bit.Android.Controls
-{
-    public class ExtendedTableViewRenderer : TableViewRenderer
-    {
-        protected override void OnElementChanged(ElementChangedEventArgs<TableView> e)
-        {
-            base.OnElementChanged(e);
-            Control.Divider = null;
-            Control.DividerHeight = 0;
-        }
-
-        protected override TableViewModelRenderer GetModelRenderer(AListView listView, TableView view)
-        {
-            return new CustomTableViewModelRenderer(Context, listView, view);
-        }
-
-        public override SizeRequest GetDesiredSize(int widthConstraint, int heightConstraint)
-        {
-            var baseSize = base.GetDesiredSize(widthConstraint, heightConstraint);
-            var height = ComputeHeight(Control, Convert.ToInt32(baseSize.Request.Width));
-            return new SizeRequest(new Size(baseSize.Request.Width, height));
-        }
-
-        private int ComputeHeight(AListView listView, int width)
-        {
-            var element = Element as ExtendedTableView;
-
-            var adapter = listView.Adapter;
-            var totalHeight = listView.PaddingTop + listView.PaddingBottom;
-            var desiredWidth = MeasureSpec.MakeMeasureSpec(width, MeasureSpecMode.AtMost);
-            for(var i = 0; i < adapter.Count; i++)
-            {
-                if(i == 0 && (element?.NoHeader ?? false))
-                {
-                    totalHeight += 1;
-                    continue;
-                }
-
-                var view = adapter.GetView(i, null, listView);
-                view.LayoutParameters = new LayoutParams(LayoutParams.WrapContent, LayoutParams.WrapContent);
-                view.Measure(desiredWidth, MeasureSpec.MakeMeasureSpec(0, MeasureSpecMode.Unspecified));
-                totalHeight += view.MeasuredHeight;
-            }
-
-            return totalHeight + (listView.DividerHeight * (adapter.Count - 1));
-        }
-
-        private class CustomTableViewModelRenderer : TableViewModelRenderer
-        {
-            private readonly ExtendedTableView _view;
-            private readonly AListView _listView;
-
-            public CustomTableViewModelRenderer(Context context, AListView listView, TableView view)
-                : base(context, listView, view)
-            {
-                _view = view as ExtendedTableView;
-                _listView = listView;
-            }
-
-            private ITableViewController Controller => _view;
-
-            // ref http://bit.ly/2b9cjnQ
-            public override AView GetView(int position, AView convertView, ViewGroup parent)
-            {
-                var baseView = base.GetView(position, convertView, parent);
-                var layout = baseView as LinearLayout;
-                if(layout == null)
-                {
-                    return baseView;
-                }
-
-                bool isHeader, nextIsHeader;
-                var cell = GetCellForPosition(position, out isHeader, out nextIsHeader);
-                if(layout.ChildCount > 0)
-                {
-                    layout.RemoveViewAt(0);
-                    var cellView = CellFactory.GetCell(cell, convertView, parent, Context, _view);
-                    layout.AddView(cellView, 0);
-                }
-
-                if(isHeader)
-                {
-                    var textCell = layout.GetChildAt(0) as BaseCellView;
-                    if(textCell != null)
-                    {
-                        if(position == 0 && _view.NoHeader)
-                        {
-                            textCell.Visibility = ViewStates.Gone;
-                        }
-                        else
-                        {
-                            textCell.MainText = textCell.MainText?.ToUpperInvariant();
-                            textCell.SetMainTextColor(Color.FromHex("777777"));
-                        }
-                    }
-                }
-
-                var bline = layout.GetChildAt(1);
-                if(bline != null)
-                {
-                    bline.SetBackgroundColor(_view.SeparatorColor.ToAndroid());
-                }
-
-                return layout;
-            }
-
-            // Copy/pasted from Xamarin source. Invoke via reflection instead maybe?
-            private Cell GetCellForPosition(int position, out bool isHeader, out bool nextIsHeader)
-            {
-                isHeader = false;
-                nextIsHeader = false;
-
-                var model = Controller.Model;
-                var sectionCount = model.GetSectionCount();
-
-                for(var sectionIndex = 0; sectionIndex < sectionCount; sectionIndex++)
-                {
-                    var size = model.GetRowCount(sectionIndex) + 1;
-                    if(position == 0)
-                    {
-                        isHeader = true;
-                        nextIsHeader = size == 0 && sectionIndex < sectionCount - 1;
-
-                        var header = model.GetHeaderCell(sectionIndex);
-                        Cell resultCell = null;
-                        if(header != null)
-                        {
-                            resultCell = header;
-                        }
-
-                        if(resultCell == null)
-                        {
-                            resultCell = new TextCell { Text = model.GetSectionTitle(sectionIndex) };
-                        }
-
-                        resultCell.Parent = _view;
-                        return resultCell;
-                    }
-
-                    if(position < size)
-                    {
-                        nextIsHeader = position == size - 1;
-                        return (Cell)model.GetItem(sectionIndex, position - 1);
-                    }
-
-                    position -= size;
-                }
-
-                return null;
-            }
-        }
-    }
-}

src/Android/Controls/ExtendedTextCellRenderer.cs

@@ -1,155 +0,0 @@
-using Android.Content;
-using System.ComponentModel;
-using Android.Views;
-using Bit.Android.Controls;
-using Bit.App.Controls;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-using AView = Android.Views.View;
-using Android.Widget;
-using Android.Text;
-
-[assembly: ExportRenderer(typeof(ExtendedTextCell), typeof(ExtendedTextCellRenderer))]
-namespace Bit.Android.Controls
-{
-    public class ExtendedTextCellRenderer : TextCellRenderer
-    {
-        protected AView View { get; private set; }
-
-        protected override AView GetCellCore(Cell item, AView convertView, ViewGroup parent, Context context)
-        {
-            var View = (BaseCellView)base.GetCellCore(item, convertView, parent, context);
-            var extendedCell = (ExtendedTextCell)item;
-
-            if(View != null)
-            {
-                if(extendedCell.BackgroundColor != Color.White)
-                {
-                    View.SetBackgroundColor(extendedCell.BackgroundColor.ToAndroid());
-                }
-                else
-                {
-                    View.SetBackgroundResource(Resource.Drawable.list_selector);
-                }
-
-                if(extendedCell.ShowDisclousure)
-                {
-                    var resourceId = Resource.Drawable.ion_chevron_right;
-                    if(!string.IsNullOrWhiteSpace(extendedCell.DisclousureImage))
-                    {
-                        var fileName = System.IO.Path.GetFileNameWithoutExtension(extendedCell.DisclousureImage);
-                        resourceId = context.Resources.GetIdentifier(fileName, "drawable", context.PackageName);
-                    }
-
-                    var image = new DisclosureImage(context, extendedCell);
-                    image.SetImageResource(resourceId);
-                    image.SetPadding(10, 10, 30, 10);
-                    View.SetAccessoryView(image);
-                }
-
-                if(View.ChildCount > 1)
-                {
-                    var layout = View.GetChildAt(1) as LinearLayout;
-                    if(layout != null)
-                    {
-                        if(layout.ChildCount > 0)
-                        {
-                            var textView = layout.GetChildAt(0) as TextView;
-                            if(textView != null)
-                            {
-                                textView.TextSize = (float)Device.GetNamedSize(NamedSize.Medium, typeof(Label));
-                            }
-                        }
-
-                        if(layout.ChildCount > 1)
-                        {
-                            var detailView = layout.GetChildAt(1) as TextView;
-                            if(detailView != null)
-                            {
-                                UpdateLineBreakMode(detailView, extendedCell.DetailLineBreakMode);
-                            }
-                        }
-                    }
-                }
-            }
-
-            return View;
-        }
-
-        protected override void OnCellPropertyChanged(object sender, PropertyChangedEventArgs args)
-        {
-            base.OnCellPropertyChanged(sender, args);
-
-            var cell = (ExtendedTextCell)Cell;
-
-            if(args.PropertyName == ExtendedTextCell.BackgroundColorProperty.PropertyName)
-            {
-                View.SetBackgroundColor(cell.BackgroundColor.ToAndroid());
-            }
-
-            // TODO: other properties
-        }
-
-        private void UpdateLineBreakMode(TextView view, LineBreakMode lineBreakMode)
-        {
-            if(view == null)
-            {
-                return;
-            }
-
-            switch(lineBreakMode)
-            {
-                case LineBreakMode.NoWrap:
-                    view.SetSingleLine(true);
-                    view.Ellipsize = null;
-                    break;
-                case LineBreakMode.WordWrap:
-                    view.SetSingleLine(false);
-                    view.Ellipsize = null;
-                    view.SetMaxLines(100);
-                    break;
-                case LineBreakMode.CharacterWrap:
-                    view.SetSingleLine(false);
-                    view.Ellipsize = null;
-                    view.SetMaxLines(100);
-                    break;
-                case LineBreakMode.HeadTruncation:
-                    view.SetSingleLine(true);
-                    view.Ellipsize = TextUtils.TruncateAt.Start;
-                    break;
-                case LineBreakMode.TailTruncation:
-                    view.SetSingleLine(true);
-                    view.Ellipsize = TextUtils.TruncateAt.End;
-                    break;
-                case LineBreakMode.MiddleTruncation:
-                    view.SetSingleLine(true);
-                    view.Ellipsize = TextUtils.TruncateAt.Middle;
-                    break;
-            }
-        }
-
-        private class DisclosureImage : ImageView
-        {
-            private ExtendedTextCell _cell;
-
-            public DisclosureImage(Context context, ExtendedTextCell cell) : base(context)
-            {
-                _cell = cell;
-            }
-
-            public override bool OnTouchEvent(MotionEvent e)
-            {
-                switch(e.Action)
-                {
-                    case MotionEventActions.Up:
-                        _cell.OnDisclousureTapped();
-                        break;
-                    default:
-                        break;
-                }
-
-                return true;
-            }
-        }
-    }
-}

src/Android/Controls/ExtendedViewCellRenderer.cs

@@ -1,49 +0,0 @@
-using Android.Content;
-using System.ComponentModel;
-using Android.Views;
-using Bit.Android.Controls;
-using Bit.App.Controls;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-using AView = Android.Views.View;
-
-[assembly: ExportRenderer(typeof(ExtendedViewCell), typeof(ExtendedViewCellRenderer))]
-namespace Bit.Android.Controls
-{
-    public class ExtendedViewCellRenderer : ViewCellRenderer
-    {
-        protected AView View { get; private set; }
-
-        protected override AView GetCellCore(Cell item, AView convertView, ViewGroup parent, Context context)
-        {
-            var View = base.GetCellCore(item, convertView, parent, context);
-            var extendedCell = (ExtendedViewCell)item;
-
-            if(View != null)
-            {
-                if(extendedCell.BackgroundColor != Color.White)
-                {
-                    View.SetBackgroundColor(extendedCell.BackgroundColor.ToAndroid());
-                }
-                else
-                {
-                    View.SetBackgroundResource(Resource.Drawable.list_selector);
-                }
-            }
-
-            return View;
-        }
-
-        protected override void OnCellPropertyChanged(object sender, PropertyChangedEventArgs args)
-        {
-            base.OnCellPropertyChanged(sender, args);
-
-            var cell = (ExtendedViewCell)Cell;
-
-            if(args.PropertyName == ExtendedViewCell.BackgroundColorProperty.PropertyName)
-            {
-                View.SetBackgroundColor(cell.BackgroundColor.ToAndroid());
-            }
-        }
-    }
-}

src/Android/CustomAndroidClientHandler.cs

@@ -1,774 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-using Android.Runtime;
-using Java.IO;
-using Java.Net;
-using Java.Security;
-using Java.Security.Cert;
-using Javax.Net.Ssl;
-
-namespace Xamarin.Android.Net
-{
-    /// <summary>
-    /// A custom implementation of <see cref="System.Net.Http.HttpClientHandler"/> which internally uses <see cref="Java.Net.HttpURLConnection"/>
-    /// (or its HTTPS incarnation) to send HTTP requests.
-    /// </summary>
-    /// <remarks>
-    /// <para>Instance of this class is used to configure <see cref="System.Net.Http.HttpClient"/> instance
-    /// in the following way:
-    /// 
-    /// <example>
-    /// var handler = new AndroidClientHandler {
-    ///    UseCookies = true,
-    ///    AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip,
-    /// };
-    ///
-    /// var httpClient = new HttpClient (handler);
-    /// var response = httpClient.GetAsync ("http://example.com")?.Result as AndroidHttpResponseMessage;
-    /// </example></para>
-    /// <para>
-    /// The class supports pre-authentication of requests albeit in a slightly "manual" way. Namely, whenever a request to a server requiring authentication
-    /// is made and no authentication credentials are provided in the <see cref="PreAuthenticationData"/> property (which is usually the case on the first
-    /// request), the <see cref="RequestNeedsAuthorization"/> property will return <c>true</c> and the <see cref="RequestedAuthentication"/> property will
-    /// contain all the authentication information gathered from the server. The application must then fill in the blanks (i.e. the credentials) and re-send
-    /// the request configured to perform pre-authentication. The reason for this manual process is that the underlying Java HTTP client API supports only a 
-    /// single, VM-wide, authentication handler which cannot be configured to handle credentials for several requests. AndroidClientHandler, therefore, implements
-    /// the authentication in managed .NET code. Message handler supports both Basic and Digest authentication. If an authentication scheme that's not supported
-    /// by AndroidClientHandler is requested by the server, the application can provide its own authentication module (<see cref="AuthenticationData"/>, 
-    /// <see cref="PreAuthenticationData"/>) to handle the protocol authorization.</para>
-    /// <para>AndroidClientHandler also supports requests to servers with "invalid" (e.g. self-signed) SSL certificates. Since this process is a bit convoluted using
-    /// the Java APIs, AndroidClientHandler defines two ways to handle the situation. First, easier, is to store the necessary certificates (either CA or server certificates)
-    /// in the <see cref="TrustedCerts"/> collection or, after deriving a custom class from AndroidClientHandler, by overriding one or more methods provided for this purpose
-    /// (<see cref="ConfigureTrustManagerFactory"/>, <see cref="ConfigureKeyManagerFactory"/> and <see cref="ConfigureKeyStore"/>). The former method should be sufficient
-    /// for most use cases, the latter allows the application to provide fully customized key store, trust manager and key manager, if needed. Note that the instance of
-    /// AndroidClientHandler configured to accept an "invalid" certificate from the particular server will most likely fail to validate certificates from other servers (even
-    /// if they use a certificate with a fully validated trust chain) unless you store the CA certificates from your Android system in <see cref="TrustedCerts"/> along with
-    /// the self-signed certificate(s).</para>
-    /// </remarks>
-    public class CustomAndroidClientHandler : HttpClientHandler
-    {
-        sealed class RequestRedirectionState
-        {
-            public Uri NewUrl;
-            public int RedirectCounter;
-            public HttpMethod Method;
-        }
-
-        internal const string LOG_APP = "monodroid-net";
-
-        const string GZIP_ENCODING = "gzip";
-        const string DEFLATE_ENCODING = "deflate";
-        const string IDENTITY_ENCODING = "identity";
-
-        static readonly HashSet<string> known_content_headers = new HashSet<string>(StringComparer.OrdinalIgnoreCase) {
-            "Allow",
-            "Content-Disposition",
-            "Content-Encoding",
-            "Content-Language",
-            "Content-Length",
-            "Content-Location",
-            "Content-MD5",
-            "Content-Range",
-            "Content-Type",
-            "Expires",
-            "Last-Modified"
-        };
-
-        static readonly List<IAndroidAuthenticationModule> authModules = new List<IAndroidAuthenticationModule> {
-            new AuthModuleBasic (),
-            // COMMENTED OUT: Kyle
-            //new AuthModuleDigest ()
-        };
-
-        bool disposed;
-
-        // Now all hail Java developers! Get this... HttpURLClient defaults to accepting AND
-        // uncompressing the gzip content encoding UNLESS you set the Accept-Encoding header to ANY
-        // value. So if we set it to 'gzip' below we WILL get gzipped stream but HttpURLClient will NOT
-        // uncompress it any longer, doh. And they don't support 'deflate' so we need to handle it ourselves.
-        bool decompress_here;
-
-        /// <summary>
-        /// <para>
-        /// Gets or sets the pre authentication data for the request. This property must be set by the application
-        /// before the request is made. Generally the value can be taken from <see cref="RequestedAuthentication"/>
-        /// after the initial request, without any authentication data, receives the authorization request from the
-        /// server. The application must then store credentials in instance of <see cref="AuthenticationData"/> and
-        /// assign the instance to this propery before retrying the request.
-        /// </para>
-        /// <para>
-        /// The property is never set by AndroidClientHandler.
-        /// </para>
-        /// </summary>
-        /// <value>The pre authentication data.</value>
-        public AuthenticationData PreAuthenticationData { get; set; }
-
-        /// <summary>
-        /// If the website requires authentication, this property will contain data about each scheme supported
-        /// by the server after the response. Note that unauthorized request will return a valid response - you
-        /// need to check the status code and and (re)configure AndroidClientHandler instance accordingly by providing
-        /// both the credentials and the authentication scheme by setting the <see cref="PreAuthenticationData"/> 
-        /// property. If AndroidClientHandler is not able to detect the kind of authentication scheme it will store an
-        /// instance of <see cref="AuthenticationData"/> with its <see cref="AuthenticationData.Scheme"/> property
-        /// set to <c>AuthenticationScheme.Unsupported</c> and the application will be responsible for providing an
-        /// instance of <see cref="IAndroidAuthenticationModule"/> which handles this kind of authorization scheme
-        /// (<see cref="AuthenticationData.AuthModule"/>
-        /// </summary>
-        public IList<AuthenticationData> RequestedAuthentication { get; private set; }
-
-        /// <summary>
-        /// Server authentication response indicates that the request to authorize comes from a proxy if this property is <c>true</c>.
-        /// All the instances of <see cref="AuthenticationData"/> stored in the <see cref="RequestedAuthentication"/> property will
-        /// have their <see cref="AuthenticationData.UseProxyAuthentication"/> preset to the same value as this property.
-        /// </summary>
-        public bool ProxyAuthenticationRequested { get; private set; }
-
-        /// <summary>
-        /// If <c>true</c> then the server requested authorization and the application must use information
-        /// found in <see cref="RequestedAuthentication"/> to set the value of <see cref="PreAuthenticationData"/>
-        /// </summary>
-        public bool RequestNeedsAuthorization
-        {
-            get { return RequestedAuthentication?.Count > 0; }
-        }
-
-        /// <summary>
-        /// <para>
-        /// If the request is to the server protected with a self-signed (or otherwise untrusted) SSL certificate, the request will
-        /// fail security chain verification unless the application provides either the CA certificate of the entity which issued the 
-        /// server's certificate or, alternatively, provides the server public key. Whichever the case, the certificate(s) must be stored
-        /// in this property in order for AndroidClientHandler to configure the request to accept the server certificate.</para>
-        /// <para>AndroidClientHandler uses a custom <see cref="KeyStore"/> and <see cref="TrustManagerFactory"/> to configure the connection. 
-        /// If, however, the application requires finer control over the SSL configuration (e.g. it implements its own TrustManager) then
-        /// it should leave this property empty and instead derive a custom class from AndroidClientHandler and override, as needed, the 
-        /// <see cref="ConfigureTrustManagerFactory"/>, <see cref="ConfigureKeyManagerFactory"/> and <see cref="ConfigureKeyStore"/> methods
-        /// instead</para>
-        /// </summary>
-        /// <value>The trusted certs.</value>
-        public IList<Certificate> TrustedCerts { get; set; }
-
-        protected override void Dispose(bool disposing)
-        {
-            disposed = true;
-
-            base.Dispose(disposing);
-        }
-
-        protected void AssertSelf()
-        {
-            if(!disposed)
-                return;
-            throw new ObjectDisposedException(nameof(AndroidClientHandler));
-        }
-
-        string EncodeUrl(Uri url)
-        {
-            if(url == null)
-                return String.Empty;
-
-            if(String.IsNullOrEmpty(url.Query))
-                return Uri.EscapeUriString(url.ToString());
-
-            // UriBuilder takes care of encoding everything properly
-            var bldr = new UriBuilder(url);
-            if(url.IsDefaultPort)
-                bldr.Port = -1; // Avoids adding :80 or :443 to the host name in the result
-
-            // bldr.Uri.ToString () would ruin the good job UriBuilder did
-            return bldr.ToString();
-        }
-
-        /// <summary>
-        /// Creates, configures and processes an asynchronous request to the indicated resource.
-        /// </summary>
-        /// <returns>Task in which the request is executed</returns>
-        /// <param name="request">Request provided by <see cref="System.Net.Http.HttpClient"/></param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-        {
-            AssertSelf();
-            if(request == null)
-                throw new ArgumentNullException(nameof(request));
-
-            if(!request.RequestUri.IsAbsoluteUri)
-                throw new ArgumentException("Must represent an absolute URI", "request");
-
-            var redirectState = new RequestRedirectionState
-            {
-                NewUrl = request.RequestUri,
-                RedirectCounter = 0,
-                Method = request.Method
-            };
-            while(true)
-            {
-                URL java_url = new URL(EncodeUrl(redirectState.NewUrl));
-                URLConnection java_connection = java_url.OpenConnection();
-                HttpURLConnection httpConnection = await SetupRequestInternal(request, java_connection);
-                HttpResponseMessage response = await ProcessRequest(request, java_url, httpConnection, cancellationToken, redirectState);
-                if(response != null)
-                    return response;
-
-                if(redirectState.NewUrl == null)
-                    throw new InvalidOperationException("Request redirected but no new URI specified");
-                request.Method = redirectState.Method;
-            }
-        }
-
-        Task<HttpResponseMessage> ProcessRequest(HttpRequestMessage request, URL javaUrl, HttpURLConnection httpConnection, CancellationToken cancellationToken, RequestRedirectionState redirectState)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-            httpConnection.InstanceFollowRedirects = false; // We handle it ourselves
-            RequestedAuthentication = null;
-            ProxyAuthenticationRequested = false;
-
-            return DoProcessRequest(request, javaUrl, httpConnection, cancellationToken, redirectState);
-        }
-
-        async Task<HttpResponseMessage> DoProcessRequest(HttpRequestMessage request, URL javaUrl, HttpURLConnection httpConnection, CancellationToken cancellationToken, RequestRedirectionState redirectState)
-        {
-            if(cancellationToken.IsCancellationRequested)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-            }
-
-            try
-            {
-                await Task.WhenAny(
-                        httpConnection.ConnectAsync(),
-                        Task.Run(() => { cancellationToken.WaitHandle.WaitOne(); }))
-                    .ConfigureAwait(false);
-            }
-            catch(Java.Net.ConnectException ex)
-            {
-                // Wrap it nicely in a "standard" exception so that it's compatible with HttpClientHandler
-                throw new WebException(ex.Message, ex, WebExceptionStatus.ConnectFailure, null);
-            }
-
-            if(cancellationToken.IsCancellationRequested)
-            {
-                httpConnection.Disconnect();
-                cancellationToken.ThrowIfCancellationRequested();
-            }
-            cancellationToken.Register(httpConnection.Disconnect);
-
-            if(httpConnection.DoOutput)
-            {
-                using(var stream = await request.Content.ReadAsStreamAsync())
-                {
-                    await stream.CopyToAsync(httpConnection.OutputStream, 4096, cancellationToken)
-                        .ConfigureAwait(false);
-                }
-            }
-
-            if(cancellationToken.IsCancellationRequested)
-            {
-                httpConnection.Disconnect();
-                cancellationToken.ThrowIfCancellationRequested();
-            }
-
-            var statusCode = await Task.Run(() => (HttpStatusCode)httpConnection.ResponseCode).ConfigureAwait(false);
-            var connectionUri = new Uri(httpConnection.URL.ToString());
-
-            // If the request was redirected we need to put the new URL in the request
-            request.RequestUri = connectionUri;
-            var ret = new AndroidHttpResponseMessage(javaUrl, httpConnection)
-            {
-                RequestMessage = request,
-                ReasonPhrase = httpConnection.ResponseMessage,
-                StatusCode = statusCode,
-            };
-
-            bool disposeRet;
-            if(HandleRedirect(statusCode, httpConnection, redirectState, out disposeRet))
-            {
-                if(disposeRet)
-                {
-                    ret.Dispose();
-                    ret = null;
-                }
-                return ret;
-            }
-
-            switch(statusCode)
-            {
-                case HttpStatusCode.Unauthorized:
-                case HttpStatusCode.ProxyAuthenticationRequired:
-                    // We don't resend the request since that would require new set of credentials if the
-                    // ones provided in Credentials are invalid (or null) and that, in turn, may require asking the
-                    // user which is not something that should be taken care of by us and in this
-                    // context. The application should be responsible for this.
-                    // HttpClientHandler throws an exception in this instance, but I think it's not a good
-                    // idea. We'll return the response message with all the information required by the
-                    // application to fill in the blanks and provide the requested credentials instead.
-                    //
-                    // We return the body of the response too, but the Java client will throw
-                    // a FileNotFound exception if we attempt to access the input stream.
-                    // Instead we try to read the error stream and return an default message if the error stream isn't readable.
-                    ret.Content = GetErrorContent(httpConnection, new StringContent("Unauthorized", Encoding.ASCII));
-                    CopyHeaders(httpConnection, ret);
-
-                    if(ret.Headers.WwwAuthenticate != null)
-                    {
-                        ProxyAuthenticationRequested = false;
-                        CollectAuthInfo(ret.Headers.WwwAuthenticate);
-                    }
-                    else if(ret.Headers.ProxyAuthenticate != null)
-                    {
-                        ProxyAuthenticationRequested = true;
-                        CollectAuthInfo(ret.Headers.ProxyAuthenticate);
-                    }
-
-                    // COMMENTED OUT: Kyle
-                    //ret.RequestedAuthentication = RequestedAuthentication;
-                    return ret;
-            }
-
-            if(!IsErrorStatusCode(statusCode))
-            {
-                ret.Content = GetContent(httpConnection, httpConnection.InputStream);
-            }
-            else
-            {
-                // For 400 >= response code <= 599 the Java client throws the FileNotFound exception when attempting to read from the input stream.
-                // Instead we try to read the error stream and return an empty string if the error stream isn't readable.
-                ret.Content = GetErrorContent(httpConnection, new StringContent(String.Empty, Encoding.ASCII));
-            }
-
-            CopyHeaders(httpConnection, ret);
-
-            IEnumerable<string> cookieHeaderValue;
-            if(!UseCookies || CookieContainer == null || !ret.Headers.TryGetValues("Set-Cookie", out cookieHeaderValue) || cookieHeaderValue == null)
-            {
-                return ret;
-            }
-
-            try
-            {
-                CookieContainer.SetCookies(connectionUri, String.Join(",", cookieHeaderValue));
-            }
-            catch(Exception ex)
-            {
-                // We don't want to terminate the response because of a bad cookie, hence just reporting
-                // the issue. We might consider adding a virtual method to let the user handle the
-                // issue, but not sure if it's really needed. Set-Cookie header will be part of the
-                // header collection so the user can always examine it if they spot an error.
-            }
-
-            return ret;
-        }
-
-        HttpContent GetErrorContent(HttpURLConnection httpConnection, HttpContent fallbackContent)
-        {
-            var contentStream = httpConnection.ErrorStream;
-
-            if(contentStream != null)
-            {
-                return GetContent(httpConnection, contentStream);
-            }
-
-            return fallbackContent;
-        }
-
-        HttpContent GetContent(URLConnection httpConnection, Stream contentStream)
-        {
-            Stream inputStream = new BufferedStream(contentStream);
-            if(decompress_here)
-            {
-                string[] encodings = httpConnection.ContentEncoding?.Split(',');
-                if(encodings != null)
-                {
-                    if(encodings.Contains(GZIP_ENCODING, StringComparer.OrdinalIgnoreCase))
-                        inputStream = new GZipStream(inputStream, CompressionMode.Decompress);
-                    else if(encodings.Contains(DEFLATE_ENCODING, StringComparer.OrdinalIgnoreCase))
-                        inputStream = new DeflateStream(inputStream, CompressionMode.Decompress);
-                }
-            }
-            return new StreamContent(inputStream);
-        }
-
-        bool HandleRedirect(HttpStatusCode redirectCode, HttpURLConnection httpConnection, RequestRedirectionState redirectState, out bool disposeRet)
-        {
-            if(!AllowAutoRedirect)
-            {
-                disposeRet = false;
-                return true; // We shouldn't follow and there's no data to fetch, just return
-            }
-            disposeRet = true;
-
-            redirectState.NewUrl = null;
-            switch(redirectCode)
-            {
-                case HttpStatusCode.MultipleChoices:   // 300
-                    break;
-
-                case HttpStatusCode.Moved:             // 301
-                case HttpStatusCode.Redirect:          // 302
-                case HttpStatusCode.SeeOther:          // 303
-                    redirectState.Method = HttpMethod.Get;
-                    break;
-
-                case HttpStatusCode.TemporaryRedirect: // 307
-                    break;
-
-                default:
-                    if((int)redirectCode >= 300 && (int)redirectCode < 400)
-                        throw new InvalidOperationException($"HTTP Redirection status code {redirectCode} ({(int)redirectCode}) not supported");
-                    return false;
-            }
-
-            IDictionary<string, IList<string>> headers = httpConnection.HeaderFields;
-            IList<string> locationHeader;
-            if(!headers.TryGetValue("Location", out locationHeader) || locationHeader == null || locationHeader.Count == 0)
-                throw new InvalidOperationException($"HTTP connection redirected with code {redirectCode} ({(int)redirectCode}) but no Location header found in response");
-
-
-            redirectState.RedirectCounter++;
-            if(redirectState.RedirectCounter >= MaxAutomaticRedirections)
-                throw new WebException($"Maximum automatic redirections exceeded (allowed {MaxAutomaticRedirections}, redirected {redirectState.RedirectCounter} times)");
-
-            Uri location = new Uri(locationHeader[0], UriKind.Absolute);
-            redirectState.NewUrl = location;
-
-            return true;
-        }
-
-        bool IsErrorStatusCode(HttpStatusCode statusCode)
-        {
-            return (int)statusCode >= 400 && (int)statusCode <= 599;
-        }
-
-        void CollectAuthInfo(HttpHeaderValueCollection<AuthenticationHeaderValue> headers)
-        {
-            var authData = new List<AuthenticationData>(headers.Count);
-
-            foreach(AuthenticationHeaderValue ahv in headers)
-            {
-                var data = new AuthenticationData
-                {
-                    Scheme = GetAuthScheme(ahv.Scheme),
-                    // COMMENTED OUT: Kyle
-                    //Challenge = $"{ahv.Scheme} {ahv.Parameter}",
-                    UseProxyAuthentication = ProxyAuthenticationRequested
-                };
-                authData.Add(data);
-            }
-
-            RequestedAuthentication = authData.AsReadOnly();
-        }
-
-        AuthenticationScheme GetAuthScheme(string scheme)
-        {
-            if(String.Compare("basic", scheme, StringComparison.OrdinalIgnoreCase) == 0)
-                return AuthenticationScheme.Basic;
-            if(String.Compare("digest", scheme, StringComparison.OrdinalIgnoreCase) == 0)
-                return AuthenticationScheme.Digest;
-
-            return AuthenticationScheme.Unsupported;
-        }
-
-        void CopyHeaders(HttpURLConnection httpConnection, HttpResponseMessage response)
-        {
-            IDictionary<string, IList<string>> headers = httpConnection.HeaderFields;
-            foreach(string key in headers.Keys)
-            {
-                if(key == null) // First header entry has null key, it corresponds to the response message
-                    continue;
-
-                HttpHeaders item_headers;
-                string kind;
-                if(known_content_headers.Contains(key))
-                {
-                    kind = "content";
-                    item_headers = response.Content.Headers;
-                }
-                else
-                {
-                    kind = "response";
-                    item_headers = response.Headers;
-                }
-                item_headers.TryAddWithoutValidation(key, headers[key]);
-            }
-        }
-
-        /// <summary>
-        /// Configure the <see cref="HttpURLConnection"/> before the request is sent. This method is meant to be overriden
-        /// by applications which need to perform some extra configuration steps on the connection. It is called with all
-        /// the request headers set, pre-authentication performed (if applicable) but before the request body is set 
-        /// (e.g. for POST requests). The default implementation in AndroidClientHandler does nothing.
-        /// </summary>
-        /// <param name="request">Request data</param>
-        /// <param name="conn">Pre-configured connection instance</param>
-        protected virtual Task SetupRequest(HttpRequestMessage request, HttpURLConnection conn)
-        {
-            return Task.Factory.StartNew(AssertSelf);
-        }
-
-        /// <summary>
-        /// Configures the key store. The <paramref name="keyStore"/> parameter is set to instance of <see cref="KeyStore"/>
-        /// created using the <see cref="KeyStore.DefaultType"/> type and with populated with certificates provided in the <see cref="TrustedCerts"/>
-        /// property. AndroidClientHandler implementation simply returns the instance passed in the <paramref name="keyStore"/> parameter
-        /// </summary>
-        /// <returns>The key store.</returns>
-        /// <param name="keyStore">Key store to configure.</param>
-        protected virtual KeyStore ConfigureKeyStore(KeyStore keyStore)
-        {
-            AssertSelf();
-
-            return keyStore;
-        }
-
-        /// <summary>
-        /// Create and configure an instance of <see cref="KeyManagerFactory"/>. The <paramref name="keyStore"/> parameter is set to the
-        /// return value of the <see cref="ConfigureKeyStore"/> method, so it might be null if the application overrode the method and provided
-        /// no key store. It will not be <c>null</c> when the default implementation is used. The application can return <c>null</c> here since
-        /// KeyManagerFactory is not required for the custom SSL configuration, but it might be used by the application to implement a more advanced
-        /// mechanism of key management.
-        /// </summary>
-        /// <returns>The key manager factory or <c>null</c>.</returns>
-        /// <param name="keyStore">Key store.</param>
-        protected virtual KeyManagerFactory ConfigureKeyManagerFactory(KeyStore keyStore)
-        {
-            AssertSelf();
-
-            return null;
-        }
-
-        /// <summary>
-        /// Create and configure an instance of <see cref="TrustManagerFactory"/>. The <paramref name="keyStore"/> parameter is set to the
-        /// return value of the <see cref="ConfigureKeyStore"/> method, so it might be null if the application overrode the method and provided
-        /// no key store. It will not be <c>null</c> when the default implementation is used. The application can return <c>null</c> from this 
-        /// method in which case AndroidClientHandler will create its own instance of the trust manager factory provided that the <see cref="TrustCerts"/>
-        /// list contains at least one valid certificate. If there are no valid certificates and this method returns <c>null</c>, no custom 
-        /// trust manager will be created since that would make all the HTTPS requests fail.
-        /// </summary>
-        /// <returns>The trust manager factory.</returns>
-        /// <param name="keyStore">Key store.</param>
-        protected virtual TrustManagerFactory ConfigureTrustManagerFactory(KeyStore keyStore)
-        {
-            AssertSelf();
-
-            return null;
-        }
-
-        void AppendEncoding(string encoding, ref List<string> list)
-        {
-            if(list == null)
-                list = new List<string>();
-            if(list.Contains(encoding))
-                return;
-            list.Add(encoding);
-        }
-
-        async Task<HttpURLConnection> SetupRequestInternal(HttpRequestMessage request, URLConnection conn)
-        {
-            if(conn == null)
-                throw new ArgumentNullException(nameof(conn));
-            var httpConnection = conn.JavaCast<HttpURLConnection>();
-            if(httpConnection == null)
-                throw new InvalidOperationException($"Unsupported URL scheme {conn.URL.Protocol}");
-
-            httpConnection.RequestMethod = request.Method.ToString();
-
-            // SSL context must be set up as soon as possible, before adding any content or
-            // headers. Otherwise Java won't use the socket factory
-            SetupSSL(httpConnection as HttpsURLConnection);
-            if(request.Content != null)
-                AddHeaders(httpConnection, request.Content.Headers);
-            AddHeaders(httpConnection, request.Headers);
-
-            List<string> accept_encoding = null;
-
-            decompress_here = false;
-            if((AutomaticDecompression & DecompressionMethods.GZip) != 0)
-            {
-                AppendEncoding(GZIP_ENCODING, ref accept_encoding);
-                decompress_here = true;
-            }
-
-            if((AutomaticDecompression & DecompressionMethods.Deflate) != 0)
-            {
-                AppendEncoding(DEFLATE_ENCODING, ref accept_encoding);
-                decompress_here = true;
-            }
-
-            if(AutomaticDecompression == DecompressionMethods.None)
-            {
-                accept_encoding?.Clear();
-                AppendEncoding(IDENTITY_ENCODING, ref accept_encoding); // Turns off compression for the Java client
-            }
-
-            if(accept_encoding?.Count > 0)
-                httpConnection.SetRequestProperty("Accept-Encoding", String.Join(",", accept_encoding));
-
-            if(UseCookies && CookieContainer != null)
-            {
-                string cookieHeaderValue = CookieContainer.GetCookieHeader(request.RequestUri);
-                if(!String.IsNullOrEmpty(cookieHeaderValue))
-                    httpConnection.SetRequestProperty("Cookie", cookieHeaderValue);
-            }
-
-            HandlePreAuthentication(httpConnection);
-            await SetupRequest(request, httpConnection);
-            SetupRequestBody(httpConnection, request);
-
-            return httpConnection;
-        }
-
-        void SetupSSL(HttpsURLConnection httpsConnection)
-        {
-            if(httpsConnection == null)
-                return;
-
-            KeyStore keyStore = KeyStore.GetInstance(KeyStore.DefaultType);
-            keyStore.Load(null, null);
-            bool gotCerts = TrustedCerts?.Count > 0;
-            if(gotCerts)
-            {
-                for(int i = 0; i < TrustedCerts.Count; i++)
-                {
-                    Certificate cert = TrustedCerts[i];
-                    if(cert == null)
-                        continue;
-                    keyStore.SetCertificateEntry($"ca{i}", cert);
-                }
-            }
-            keyStore = ConfigureKeyStore(keyStore);
-            KeyManagerFactory kmf = ConfigureKeyManagerFactory(keyStore);
-            TrustManagerFactory tmf = ConfigureTrustManagerFactory(keyStore);
-
-            if(tmf == null)
-            {
-                // If there are no certs and no trust manager factory, we can't use a custom manager
-                // because it will cause all the HTTPS requests to fail because of unverified trust
-                // chain
-                if(!gotCerts)
-                    return;
-
-                tmf = TrustManagerFactory.GetInstance(TrustManagerFactory.DefaultAlgorithm);
-                tmf.Init(keyStore);
-            }
-
-            SSLContext context = SSLContext.GetInstance("TLS");
-            context.Init(kmf?.GetKeyManagers(), tmf.GetTrustManagers(), null);
-            httpsConnection.SSLSocketFactory = context.SocketFactory;
-        }
-
-        void HandlePreAuthentication(HttpURLConnection httpConnection)
-        {
-            AuthenticationData data = PreAuthenticationData;
-            if(!PreAuthenticate || data == null)
-                return;
-
-            ICredentials creds = data.UseProxyAuthentication ? Proxy?.Credentials : Credentials;
-            if(creds == null)
-            {
-                return;
-            }
-
-            IAndroidAuthenticationModule auth = data.Scheme == AuthenticationScheme.Unsupported ? data.AuthModule : authModules.Find(m => m?.Scheme == data.Scheme);
-            if(auth == null)
-            {
-                return;
-            }
-
-            Authorization authorization = auth.Authenticate(data.Challenge, httpConnection, creds);
-            if(authorization == null)
-            {
-                return;
-            }
-
-            httpConnection.SetRequestProperty(data.UseProxyAuthentication ? "Proxy-Authorization" : "Authorization", authorization.Message);
-        }
-
-        void AddHeaders(HttpURLConnection conn, HttpHeaders headers)
-        {
-            if(headers == null)
-                return;
-
-            foreach(KeyValuePair<string, IEnumerable<string>> header in headers)
-            {
-                conn.SetRequestProperty(header.Key, header.Value != null ? String.Join(",", header.Value) : String.Empty);
-            }
-        }
-
-        void SetupRequestBody(HttpURLConnection httpConnection, HttpRequestMessage request)
-        {
-            if(request.Content == null)
-            {
-                // Pilfered from System.Net.Http.HttpClientHandler:SendAync
-                if(HttpMethod.Post.Equals(request.Method) || HttpMethod.Put.Equals(request.Method) || HttpMethod.Delete.Equals(request.Method))
-                {
-                    // Explicitly set this to make sure we're sending a "Content-Length: 0" header.
-                    // This fixes the issue that's been reported on the forums:
-                    // http://forums.xamarin.com/discussion/17770/length-required-error-in-http-post-since-latest-release
-                    httpConnection.SetRequestProperty("Content-Length", "0");
-                }
-                return;
-            }
-
-            httpConnection.DoOutput = true;
-            long? contentLength = request.Content.Headers.ContentLength;
-            if(contentLength != null)
-                httpConnection.SetFixedLengthStreamingMode((int)contentLength);
-            else
-                httpConnection.SetChunkedStreamingMode(0);
-        }
-    }
-
-    sealed class AuthModuleBasic : IAndroidAuthenticationModule
-    {
-        public AuthenticationScheme Scheme { get; } = AuthenticationScheme.Basic;
-        public string AuthenticationType { get; } = "Basic";
-        public bool CanPreAuthenticate { get; } = true;
-
-        public Authorization Authenticate(string challenge, HttpURLConnection request, ICredentials credentials)
-        {
-            string header = challenge?.Trim();
-            if(credentials == null || String.IsNullOrEmpty(header))
-                return null;
-
-            if(header.IndexOf("basic", StringComparison.OrdinalIgnoreCase) == -1)
-                return null;
-
-            return InternalAuthenticate(request, credentials);
-        }
-
-        public Authorization PreAuthenticate(HttpURLConnection request, ICredentials credentials)
-        {
-            return InternalAuthenticate(request, credentials);
-        }
-
-        Authorization InternalAuthenticate(HttpURLConnection request, ICredentials credentials)
-        {
-            if(request == null || credentials == null)
-                return null;
-
-            NetworkCredential cred = credentials.GetCredential(new Uri(request.URL.ToString()), AuthenticationType.ToLowerInvariant());
-            if(cred == null)
-                return null;
-
-            if(String.IsNullOrEmpty(cred.UserName))
-                return null;
-
-            string domain = cred.Domain?.Trim();
-            string response = String.Empty;
-
-            // If domain is set, MS sends "domain\user:password".
-            if(!String.IsNullOrEmpty(domain))
-                response = domain + "\\";
-            response += cred.UserName + ":" + cred.Password;
-
-            return new Authorization($"{AuthenticationType} {Convert.ToBase64String(Encoding.ASCII.GetBytes(response))}");
-        }
-    }
-}

src/Android/Effects/FixedSizeEffect.cs

@@ -0,0 +1,26 @@
+using Android.Support.Design.BottomNavigation;
+using Android.Support.Design.Widget;
+using Android.Views;
+using Android.Widget;
+using Bit.Droid.Effects;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportEffect(typeof(FixedSizeEffect), "FixedSizeEffect")]
+namespace Bit.Droid.Effects
+{
+    public class FixedSizeEffect : PlatformEffect
+    {
+        protected override void OnAttached()
+        {
+            if(Element is Label label && Control is TextView textView)
+            {
+                textView.SetTextSize(Android.Util.ComplexUnitType.Pt, (float)label.FontSize);
+            }
+        }
+
+        protected override void OnDetached()
+        {
+        }
+    }
+}

src/Android/Effects/SelectableLabelEffect.cs

@@ -0,0 +1,26 @@
+using Android.Support.Design.BottomNavigation;
+using Android.Support.Design.Widget;
+using Android.Views;
+using Android.Widget;
+using Bit.Droid.Effects;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportEffect(typeof(SelectableLabelEffect), "SelectableLabelEffect")]
+namespace Bit.Droid.Effects
+{
+    public class SelectableLabelEffect : PlatformEffect
+    {
+        protected override void OnAttached()
+        {
+            if(Control is TextView textView)
+            {
+                textView.SetTextIsSelectable(true);
+            }
+        }
+
+        protected override void OnDetached()
+        {
+        }
+    }
+}

src/Android/Effects/TabBarEffect.cs

@@ -0,0 +1,31 @@
+using Android.Support.Design.BottomNavigation;
+using Android.Support.Design.Widget;
+using Android.Views;
+using Bit.Droid.Effects;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ResolutionGroupName("Bitwarden")]
+[assembly: ExportEffect(typeof(TabBarEffect), "TabBarEffect")]
+namespace Bit.Droid.Effects
+{
+    public class TabBarEffect : PlatformEffect
+    {
+        protected override void OnAttached()
+        {
+            if(!(Container.GetChildAt(0) is ViewGroup layout))
+            {
+                return;
+            }
+            if(!(layout.GetChildAt(1) is BottomNavigationView bottomNavigationView))
+            {
+                return;
+            }
+            bottomNavigationView.LabelVisibilityMode = LabelVisibilityMode.LabelVisibilityLabeled;
+        }
+
+        protected override void OnDetached()
+        {
+        }
+    }
+}

src/Android/EnvironmentVariables.txt

@@ -1 +0,0 @@
-XA_HTTP_CLIENT_HANDLER_TYPE=Xamarin.Android.Net.AndroidClientHandler

src/Android/MainActivity.cs

@@ -1,204 +1,376 @@
-using System;
-using Android.App;
+using Android.App;
 using Android.Content.PM;
-using Android.Views;
+using Android.Runtime;
 using Android.OS;
+using Bit.Core;
+using System.Linq;
 using Bit.App.Abstractions;
-using XLabs.Ioc;
-using Plugin.Fingerprint.Abstractions;
-using Plugin.Settings.Abstractions;
-using Plugin.Connectivity.Abstractions;
-using Acr.UserDialogs;
+using Bit.Core.Utilities;
+using Bit.Core.Abstractions;
+using System.IO;
+using System;
 using Android.Content;
-using System.Reflection;
-using Xamarin.Forms.Platform.Android;
-using Xamarin.Forms;
+using Bit.Droid.Utilities;
+using Bit.Droid.Receivers;
+using Bit.App.Models;
+using Bit.Core.Enums;
+using Android.Nfc;
+using Bit.App.Utilities;
 using System.Threading.Tasks;
-using Bit.App.Models.Page;
 
-namespace Bit.Android
+namespace Bit.Droid
 {
-    [Activity(Label = "bitwarden",
-        Icon = "@drawable/icon",
-        ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation,
-        WindowSoftInputMode = SoftInput.StateHidden)]
-    public class MainActivity : FormsAppCompatActivity
+    [Activity(
+        Label = "Bitwarden",
+        Icon = "@mipmap/ic_launcher",
+        Theme = "@style/LightTheme.Splash",
+        MainLauncher = true,
+        ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
+    [Register("com.x8bit.bitwarden.MainActivity")]
+    public class MainActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity
     {
         private const string HockeyAppId = "d3834185b4a643479047b86c65293d42";
 
-        protected override void OnCreate(Bundle bundle)
+        private IDeviceActionService _deviceActionService;
+        private IMessagingService _messagingService;
+        private IBroadcasterService _broadcasterService;
+        private IUserService _userService;
+        private IAppIdService _appIdService;
+        private IStorageService _storageService;
+        private IStateService _stateService;
+        private PendingIntent _lockAlarmPendingIntent;
+        private PendingIntent _clearClipboardPendingIntent;
+        private AppOptions _appOptions;
+        private string _activityKey = $"{nameof(MainActivity)}_{Java.Lang.JavaSystem.CurrentTimeMillis().ToString()}";
+        private Java.Util.Regex.Pattern _otpPattern =
+            Java.Util.Regex.Pattern.Compile("^.*?([cbdefghijklnrtuv]{32,64})$");
+
+        protected override void OnCreate(Bundle savedInstanceState)
         {
-            var uri = Intent.GetStringExtra("uri");
-            if(!Resolver.IsSet)
-            {
-                MainApplication.SetIoc(Application);
-            }
+            var alarmIntent = new Intent(this, typeof(LockAlarmReceiver));
+            _lockAlarmPendingIntent = PendingIntent.GetBroadcast(this, 0, alarmIntent,
+                PendingIntentFlags.UpdateCurrent);
+            var clearClipboardIntent = new Intent(this, typeof(ClearClipboardAlarmReceiver));
+            _clearClipboardPendingIntent = PendingIntent.GetBroadcast(this, 0, clearClipboardIntent,
+                PendingIntentFlags.UpdateCurrent);
 
             var policy = new StrictMode.ThreadPolicy.Builder().PermitAll().Build();
             StrictMode.SetThreadPolicy(policy);
 
-            ToolbarResource = Resource.Layout.toolbar;
-            TabLayoutResource = Resource.Layout.tabs;
+            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
+            _appIdService = ServiceContainer.Resolve<IAppIdService>("appIdService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
 
-            base.OnCreate(bundle);
+            TabLayoutResource = Resource.Layout.Tabbar;
+            ToolbarResource = Resource.Layout.Toolbar;
 
-            // workaround for app compat bug
-            // ref https://forums.xamarin.com/discussion/62414/app-resuming-results-in-crash-with-formsappcompatactivity
-            Task.Delay(10).Wait();
-
-            Console.WriteLine("A OnCreate");
-            Window.SetSoftInputMode(SoftInput.StateHidden);
-            Window.AddFlags(WindowManagerFlags.Secure);
-
-            var appIdService = Resolver.Resolve<IAppIdService>();
-            var authService = Resolver.Resolve<IAuthService>();
-
-            HockeyApp.Android.CrashManager.Register(this, HockeyAppId,
-                new HockeyAppCrashManagerListener(appIdService, authService));
-
-            Forms.Init(this, bundle);
-
-            typeof(Color).GetProperty("Accent", BindingFlags.Public | BindingFlags.Static)
-                .SetValue(null, Color.FromHex("d2d6de"));
-
-            LoadApplication(new App.App(
-                uri,
-                Resolver.Resolve<IAuthService>(),
-                Resolver.Resolve<IConnectivity>(),
-                Resolver.Resolve<IUserDialogs>(),
-                Resolver.Resolve<IDatabaseService>(),
-                Resolver.Resolve<ISyncService>(),
-                Resolver.Resolve<IFingerprint>(),
-                Resolver.Resolve<ISettings>(),
-                Resolver.Resolve<ILockService>(),
-                Resolver.Resolve<IGoogleAnalyticsService>(),
-                Resolver.Resolve<ILocalizeService>(),
-                Resolver.Resolve<IAppInfoService>()));
-
-            MessagingCenter.Subscribe<Xamarin.Forms.Application>(Xamarin.Forms.Application.Current, "RateApp", (sender) =>
+            UpdateTheme(ThemeManager.GetTheme());
+            base.OnCreate(savedInstanceState);
+            if(!CoreHelpers.InDebugMode())
             {
-                RateApp();
-            });
-
-            MessagingCenter.Subscribe<Xamarin.Forms.Application>(Xamarin.Forms.Application.Current, "Accessibility", (sender) =>
-            {
-                OpenAccessibilitySettings();
-            });
-
-            MessagingCenter.Subscribe<Xamarin.Forms.Application, VaultListPageModel.Login>(
-                Xamarin.Forms.Application.Current, "Autofill", (sender, args) =>
-            {
-                ReturnCredentials(args);
-            });
-
-            MessagingCenter.Subscribe<Xamarin.Forms.Application>(Xamarin.Forms.Application.Current, "BackgroundApp", (sender) =>
-            {
-                MoveTaskToBack(true);
-            });
-        }
-
-        private void ReturnCredentials(VaultListPageModel.Login login)
-        {
-            Intent data = new Intent();
-            if(login == null)
-            {
-                data.PutExtra("canceled", "true");
-            }
-            else
-            {
-                data.PutExtra("uri", login.Uri.Value);
-                data.PutExtra("username", login.Username);
-                data.PutExtra("password", login.Password.Value);
+                Window.AddFlags(Android.Views.WindowManagerFlags.Secure);
             }
 
-            if(Parent == null)
+#if !FDROID
+            var hockeyAppListener = new HockeyAppCrashManagerListener(_appIdService, _userService);
+            var hockeyAppTask = hockeyAppListener.InitAsync();
+            HockeyApp.Android.CrashManager.Register(this, HockeyAppId, hockeyAppListener);
+#endif
+
+            Xamarin.Essentials.Platform.Init(this, savedInstanceState);
+            Xamarin.Forms.Forms.Init(this, savedInstanceState);
+            _appOptions = GetOptions();
+            LoadApplication(new App.App(_appOptions));
+
+            _broadcasterService.Subscribe(_activityKey, (message) =>
             {
-                SetResult(Result.Ok, data);
-            }
-            else
-            {
-                Parent.SetResult(Result.Ok, data);
-            }
-            
-            Finish();
+                if(message.Command == "scheduleLockTimer")
+                {
+                    var lockOptionMinutes = (int)message.Data;
+                    var lockOptionMs = lockOptionMinutes * 60000;
+                    var triggerMs = Java.Lang.JavaSystem.CurrentTimeMillis() + lockOptionMs + 10;
+                    var alarmManager = GetSystemService(AlarmService) as AlarmManager;
+                    alarmManager.Set(AlarmType.RtcWakeup, triggerMs, _lockAlarmPendingIntent);
+                }
+                else if(message.Command == "cancelLockTimer")
+                {
+                    var alarmManager = GetSystemService(AlarmService) as AlarmManager;
+                    alarmManager.Cancel(_lockAlarmPendingIntent);
+                }
+                else if(message.Command == "finishMainActivity")
+                {
+                    Xamarin.Forms.Device.BeginInvokeOnMainThread(() => Finish());
+                }
+                else if(message.Command == "listenYubiKeyOTP")
+                {
+                    ListenYubiKey((bool)message.Data);
+                }
+                else if(message.Command == "updatedTheme")
+                {
+                    RestartApp();
+                }
+                else if(message.Command == "exit")
+                {
+                    ExitApp();
+                }
+                else if(message.Command == "copiedToClipboard")
+                {
+                    var task = ClearClipboardAlarmAsync(message.Data as Tuple<string, int?, bool>);
+                }
+            });
         }
 
         protected override void OnPause()
         {
-            Console.WriteLine("A OnPause");
             base.OnPause();
-        }
-
-        protected override void OnDestroy()
-        {
-            Console.WriteLine("A OnDestroy");
-            base.OnDestroy();
-        }
-
-        protected override void OnRestart()
-        {
-            Console.WriteLine("A OnRestart");
-            base.OnRestart();
-        }
-
-        protected override void OnStart()
-        {
-            Console.WriteLine("A OnStart");
-            base.OnStart();
-        }
-
-        protected override void OnStop()
-        {
-            Console.WriteLine("A OnStop");
-            base.OnStop();
+            ListenYubiKey(false);
         }
 
         protected override void OnResume()
         {
             base.OnResume();
-            Console.WriteLine("A OnResume");
-
-            // workaround for app compat bug
-            // ref https://bugzilla.xamarin.com/show_bug.cgi?id=36907
-            Task.Delay(10).Wait();
-        }
-
-        public void RateApp()
-        {
-            try
+            if(_deviceActionService.SupportsNfc())
             {
-                var rateIntent = RateIntentForUrl("market://details");
-                StartActivity(rateIntent);
-            }
-            catch(ActivityNotFoundException)
-            {
-                var rateIntent = RateIntentForUrl("https://play.google.com/store/apps/details");
-                StartActivity(rateIntent);
+                try
+                {
+                    _messagingService.Send("resumeYubiKey");
+                }
+                catch { }
             }
         }
 
-        private Intent RateIntentForUrl(string url)
+        protected override void OnNewIntent(Intent intent)
         {
-            var intent = new Intent(Intent.ActionView, global::Android.Net.Uri.Parse($"{url}?id={PackageName}"));
-            var flags = ActivityFlags.NoHistory | ActivityFlags.MultipleTask;
-            if((int)Build.VERSION.SdkInt >= 21)
+            base.OnNewIntent(intent);
+            if(intent.GetBooleanExtra("generatorTile", false))
             {
-                flags |= ActivityFlags.NewDocument;
+                _messagingService.Send("popAllAndGoToTabGenerator");
+                if(_appOptions != null)
+                {
+                    _appOptions.GeneratorTile = true;
+                }
+            }
+            if(intent.GetBooleanExtra("myVaultTile", false))
+            {
+                _messagingService.Send("popAllAndGoToTabMyVault");
+                if(_appOptions != null)
+                {
+                    _appOptions.MyVaultTile = true;
+                }
             }
             else
             {
-                // noinspection deprecation
-                flags |= ActivityFlags.ClearWhenTaskReset;
+                ParseYubiKey(intent.DataString);
             }
-
-            intent.AddFlags(flags);
-            return intent;
         }
 
-        private void OpenAccessibilitySettings()
+        public async override void OnRequestPermissionsResult(int requestCode, string[] permissions,
+            [GeneratedEnum] Permission[] grantResults)
         {
-            var intent = new Intent(global::Android.Provider.Settings.ActionAccessibilitySettings);
-            StartActivity(intent);
+            if(requestCode == Constants.SelectFilePermissionRequestCode)
+            {
+                if(grantResults.Any(r => r != Permission.Granted))
+                {
+                    _messagingService.Send("selectFileCameraPermissionDenied");
+                }
+                await _deviceActionService.SelectFileAsync();
+            }
+            else
+            {
+                Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+                ZXing.Net.Mobile.Forms.Android.PermissionsHandler.OnRequestPermissionsResult(
+                    requestCode, permissions, grantResults);
+            }
+            base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+        }
+
+        protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)
+        {
+            if(requestCode == Constants.SelectFileRequestCode && resultCode == Result.Ok)
+            {
+                Android.Net.Uri uri = null;
+                string fileName = null;
+                if(data != null && data.Data != null)
+                {
+                    uri = data.Data;
+                    fileName = AndroidHelpers.GetFileName(ApplicationContext, uri);
+                }
+                else
+                {
+                    // camera
+                    var root = new Java.IO.File(Android.OS.Environment.ExternalStorageDirectory, "bitwarden");
+                    var file = new Java.IO.File(root, "temp_camera_photo.jpg");
+                    uri = Android.Net.Uri.FromFile(file);
+                    fileName = $"photo_{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.jpg";
+                }
+
+                if(uri == null)
+                {
+                    return;
+                }
+                try
+                {
+                    using(var stream = ContentResolver.OpenInputStream(uri))
+                    using(var memoryStream = new MemoryStream())
+                    {
+                        stream.CopyTo(memoryStream);
+                        _messagingService.Send("selectFileResult",
+                            new Tuple<byte[], string>(memoryStream.ToArray(), fileName ?? "unknown_file_name"));
+                    }
+                }
+                catch(Java.IO.FileNotFoundException)
+                {
+                    return;
+                }
+            }
+        }
+
+        protected override void OnDestroy()
+        {
+            base.OnDestroy();
+            _broadcasterService.Unsubscribe(_activityKey);
+        }
+
+        private void ListenYubiKey(bool listen)
+        {
+            if(!_deviceActionService.SupportsNfc())
+            {
+                return;
+            }
+            var adapter = NfcAdapter.GetDefaultAdapter(this);
+            if(listen)
+            {
+                var intent = new Intent(this, Class);
+                intent.AddFlags(ActivityFlags.SingleTop);
+                var pendingIntent = PendingIntent.GetActivity(this, 0, intent, 0);
+                // register for all NDEF tags starting with http och https
+                var ndef = new IntentFilter(NfcAdapter.ActionNdefDiscovered);
+                ndef.AddDataScheme("http");
+                ndef.AddDataScheme("https");
+                var filters = new IntentFilter[] { ndef };
+                try
+                {
+                    // register for foreground dispatch so we'll receive tags according to our intent filters
+                    adapter.EnableForegroundDispatch(this, pendingIntent, filters, null);
+                }
+                catch { }
+            }
+            else
+            {
+                try
+                {
+                    adapter.DisableForegroundDispatch(this);
+                }
+                catch { }
+            }
+        }
+
+        private AppOptions GetOptions()
+        {
+            var options = new AppOptions
+            {
+                Uri = Intent.GetStringExtra("uri") ?? Intent.GetStringExtra("autofillFrameworkUri"),
+                MyVaultTile = Intent.GetBooleanExtra("myVaultTile", false),
+                GeneratorTile = Intent.GetBooleanExtra("generatorTile", false),
+                FromAutofillFramework = Intent.GetBooleanExtra("autofillFramework", false)
+            };
+            var fillType = Intent.GetIntExtra("autofillFrameworkFillType", 0);
+            if(fillType > 0)
+            {
+                options.FillType = (CipherType)fillType;
+            }
+            if(Intent.GetBooleanExtra("autofillFrameworkSave", false))
+            {
+                options.SaveType = (CipherType)Intent.GetIntExtra("autofillFrameworkType", 0);
+                options.SaveName = Intent.GetStringExtra("autofillFrameworkName");
+                options.SaveUsername = Intent.GetStringExtra("autofillFrameworkUsername");
+                options.SavePassword = Intent.GetStringExtra("autofillFrameworkPassword");
+                options.SaveCardName = Intent.GetStringExtra("autofillFrameworkCardName");
+                options.SaveCardNumber = Intent.GetStringExtra("autofillFrameworkCardNumber");
+                options.SaveCardExpMonth = Intent.GetStringExtra("autofillFrameworkCardExpMonth");
+                options.SaveCardExpYear = Intent.GetStringExtra("autofillFrameworkCardExpYear");
+                options.SaveCardCode = Intent.GetStringExtra("autofillFrameworkCardCode");
+            }
+            return options;
+        }
+
+        private void ParseYubiKey(string data)
+        {
+            if(data == null)
+            {
+                return;
+            }
+            var otpMatch = _otpPattern.Matcher(data);
+            if(otpMatch.Matches())
+            {
+                var otp = otpMatch.Group(1);
+                _messagingService.Send("gotYubiKeyOTP", otp);
+            }
+        }
+
+        private void UpdateTheme(string theme)
+        {
+            if(theme == "dark")
+            {
+                SetTheme(Resource.Style.DarkTheme);
+            }
+            else if(theme == "black")
+            {
+                SetTheme(Resource.Style.BlackTheme);
+            }
+            else if(theme == "nord")
+            {
+                SetTheme(Resource.Style.NordTheme);
+            }
+            else
+            {
+                SetTheme(Resource.Style.LightTheme);
+            }
+        }
+
+        private void RestartApp()
+        {
+            var intent = new Intent(this, typeof(MainActivity));
+            var pendingIntent = PendingIntent.GetActivity(this, 5923650, intent, PendingIntentFlags.CancelCurrent);
+            var alarmManager = GetSystemService(AlarmService) as AlarmManager;
+            var triggerMs = Java.Lang.JavaSystem.CurrentTimeMillis() + 500;
+            alarmManager.Set(AlarmType.Rtc, triggerMs, pendingIntent);
+            Java.Lang.JavaSystem.Exit(0);
+        }
+
+        private void ExitApp()
+        {
+            FinishAffinity();
+            Java.Lang.JavaSystem.Exit(0);
+        }
+
+        private async Task ClearClipboardAlarmAsync(Tuple<string, int?, bool> data)
+        {
+            if(data.Item3)
+            {
+                return;
+            }
+            var clearMs = data.Item2;
+            if(clearMs == null)
+            {
+                var clearSeconds = await _storageService.GetAsync<int?>(Constants.ClearClipboardKey);
+                if(clearSeconds != null)
+                {
+                    clearMs = clearSeconds.Value * 1000;
+                }
+            }
+            if(clearMs == null)
+            {
+                return;
+            }
+            await _stateService.SaveAsync(Constants.LastClipboardValueKey, data.Item1);
+            var triggerMs = Java.Lang.JavaSystem.CurrentTimeMillis() + clearMs.Value;
+            var alarmManager = GetSystemService(AlarmService) as AlarmManager;
+            alarmManager.Set(AlarmType.Rtc, triggerMs, _clearClipboardPendingIntent);
         }
     }
 }

src/Android/MainApplication.cs

@@ -1,242 +1,157 @@
-using System;
-using Acr.UserDialogs;
+using System;
+using System.IO;
+using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
 using Android.OS;
 using Android.Runtime;
-using Bit.Android.Services;
 using Bit.App.Abstractions;
-using Bit.App.Repositories;
 using Bit.App.Services;
-using Microsoft.Practices.Unity;
-using Plugin.Connectivity;
+using Bit.Core;
+using Bit.Core.Abstractions;
+using Bit.Core.Services;
+using Bit.Core.Utilities;
+using Bit.Droid.Services;
+using Bit.Droid.Utilities;
 using Plugin.CurrentActivity;
 using Plugin.Fingerprint;
-using Plugin.Settings;
-using PushNotification.Plugin;
-using PushNotification.Plugin.Abstractions;
-using XLabs.Ioc;
-using XLabs.Ioc.Unity;
-using System.Threading.Tasks;
-using Plugin.Settings.Abstractions;
-using Xamarin.Android.Net;
-using FFImageLoading.Forms.Droid;
+#if !FDROID
+using Android.Gms.Security;
+#endif
 
-namespace Bit.Android
+namespace Bit.Droid
 {
 #if DEBUG
     [Application(Debuggable = true)]
 #else
     [Application(Debuggable = false)]
 #endif
-    public class MainApplication : Application, Application.IActivityLifecycleCallbacks
+    [Register("com.x8bit.bitwarden.MainApplication")]
+#if FDROID
+    public class MainApplication : Application
+#else
+    public class MainApplication : Application, ProviderInstaller.IProviderInstallListener
+#endif
     {
-        private const string FirstLaunchKey = "firstLaunch";
-        private const string LastVersionCodeKey = "lastVersionCode";
-
-        public static Context AppContext;
-
         public MainApplication(IntPtr handle, JniHandleOwnership transer)
           : base(handle, transer)
         {
-            // NOTE: This is just here to stop the linker from removing AndroidClientHandler references
-            var handler = new AndroidClientHandler();
-
-            if(!Resolver.IsSet)
+            if(ServiceContainer.RegisteredServices.Count == 0)
             {
-                SetIoc(this);
+                RegisterLocalServices();
+                ServiceContainer.Init();
+                if(App.Migration.MigrationHelpers.NeedsMigration())
+                {
+                    var task = App.Migration.MigrationHelpers.PerformMigrationAsync();
+                    Task.Delay(2000).Wait();
+                }
             }
+#if !FDROID
+            if(Build.VERSION.SdkInt <= BuildVersionCodes.Kitkat)
+            {
+                ProviderInstaller.InstallIfNeededAsync(ApplicationContext, this);
+            }
+#endif
         }
 
         public override void OnCreate()
         {
             base.OnCreate();
-
-            // workaround for app compat bug
-            // ref https://forums.xamarin.com/discussion/62414/app-resuming-results-in-crash-with-formsappcompatactivity
-            Task.Delay(10).Wait();
-
-            RegisterActivityLifecycleCallbacks(this);
-            AppContext = ApplicationContext;
-            StartPushService();
-            HandlePushReregistration();
+            Bootstrap();
+            CrossCurrentActivity.Current.Init(this);
         }
 
-        private void HandlePushReregistration()
+        public void OnProviderInstallFailed(int errorCode, Intent recoveryIntent)
         {
-            var pushNotification = Resolver.Resolve<IPushNotification>();
-            var settings = Resolver.Resolve<ISettings>();
+        }
 
-            // Reregister for push token based on certain conditions
-            // ref https://github.com/rdelrosario/xamarin-plugins/issues/65
+        public void OnProviderInstalled()
+        {
+        }
 
-            var reregister = false;
-
-            // 1. First time starting the app after a new install
-            if(settings.GetValueOrDefault(FirstLaunchKey, true))
+        private void RegisterLocalServices()
+        {
+            ServiceContainer.Register<ILogService>("logService", new AndroidLogService());
+            ServiceContainer.Register("settingsShim", new App.Migration.SettingsShim());
+            if(App.Migration.MigrationHelpers.NeedsMigration())
             {
-                settings.AddOrUpdateValue(FirstLaunchKey, false);
-                reregister = true;
+                ServiceContainer.Register<App.Migration.Abstractions.IOldSecureStorageService>(
+                    "oldSecureStorageService", new Migration.AndroidKeyStoreStorageService());
             }
 
-            // 2. App version changed (installed update)
-            var versionCode = Context.ApplicationContext.PackageManager.GetPackageInfo(Context.PackageName, 0).VersionCode;
-            if(settings.GetValueOrDefault(LastVersionCodeKey, -1) != versionCode)
+            Refractored.FabControl.Droid.FloatingActionButtonViewRenderer.Init();
+            // Note: This might cause a race condition. Investigate more.
+            Task.Run(() =>
             {
-                settings.AddOrUpdateValue(LastVersionCodeKey, versionCode);
-                reregister = true;
-            }
-
-            // 3. In debug mode
-            if(InDebugMode())
-            {
-                reregister = true;
-            }
-
-            // 4. Doesn't have a push token currently
-            if(string.IsNullOrWhiteSpace(pushNotification.Token))
-            {
-                reregister = true;
-            }
-
-            if(reregister)
-            {
-                pushNotification.Unregister();
-                if(Resolver.Resolve<IAuthService>().IsAuthenticated)
+                FFImageLoading.Forms.Platform.CachedImageRenderer.Init(true);
+                FFImageLoading.ImageService.Instance.Initialize(new FFImageLoading.Config.Configuration
                 {
-                    pushNotification.Register();
-                }
-            }
-        }
+                    FadeAnimationEnabled = false,
+                    FadeAnimationForCachedImages = false
+                });
+                ZXing.Net.Mobile.Forms.Android.Platform.Init();
+            });
+            CrossFingerprint.SetCurrentActivityResolver(() => CrossCurrentActivity.Current.Activity);
+            CrossFingerprint.SetDialogFragmentType<CustomFingerprintDialogFragment>();
 
-        private bool InDebugMode()
-        {
-#if DEBUG
-            return true;
+            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);
+            var i18nService = new MobileI18nService(localizeService.GetCurrentCultureInfo());
+            var secureStorageService = new SecureStorageService();
+            var cryptoPrimitiveService = new CryptoPrimitiveService();
+            var mobileStorageService = new MobileStorageService(preferencesStorage, liteDbStorage);
+            var deviceActionService = new DeviceActionService(mobileStorageService, messagingService,
+                broadcasterService);
+            var platformUtilsService = new MobilePlatformUtilsService(deviceActionService, messagingService,
+                broadcasterService);
+
+            ServiceContainer.Register<IBroadcasterService>("broadcasterService", broadcasterService);
+            ServiceContainer.Register<IMessagingService>("messagingService", messagingService);
+            ServiceContainer.Register<ILocalizeService>("localizeService", localizeService);
+            ServiceContainer.Register<II18nService>("i18nService", i18nService);
+            ServiceContainer.Register<ICryptoPrimitiveService>("cryptoPrimitiveService", cryptoPrimitiveService);
+            ServiceContainer.Register<IStorageService>("storageService", mobileStorageService);
+            ServiceContainer.Register<IStorageService>("secureStorageService", secureStorageService);
+            ServiceContainer.Register<IDeviceActionService>("deviceActionService", deviceActionService);
+            ServiceContainer.Register<IPlatformUtilsService>("platformUtilsService", platformUtilsService);
+
+            // Push
+#if FDROID
+            ServiceContainer.Register<IPushNotificationListenerService>(
+                "pushNotificationListenerService", new NoopPushNotificationListenerService());
+            ServiceContainer.Register<IPushNotificationService>(
+                "pushNotificationService", new NoopPushNotificationService());
 #else
-            return false;
+            var notificationListenerService = new PushNotificationListenerService();
+            ServiceContainer.Register<IPushNotificationListenerService>(
+                "pushNotificationListenerService", notificationListenerService);
+            var androidPushNotificationService = new AndroidPushNotificationService(
+                mobileStorageService, notificationListenerService);
+            ServiceContainer.Register<IPushNotificationService>(
+                "pushNotificationService", androidPushNotificationService);
 #endif
         }
 
-        public override void OnTerminate()
+        private void Bootstrap()
         {
-            base.OnTerminate();
-            UnregisterActivityLifecycleCallbacks(this);
+            (ServiceContainer.Resolve<II18nService>("i18nService") as MobileI18nService).Init();
+            ServiceContainer.Resolve<IAuthService>("authService").Init();
+            // Note: This is not awaited
+            var bootstrapTask = BootstrapAsync();
         }
 
-        public void OnActivityCreated(Activity activity, Bundle savedInstanceState)
+        private async Task BootstrapAsync()
         {
-            CrossCurrentActivity.Current.Activity = activity;
-        }
-
-        public void OnActivityDestroyed(Activity activity)
-        {
-        }
-
-        public void OnActivityPaused(Activity activity)
-        {
-        }
-
-        public void OnActivityResumed(Activity activity)
-        {
-            CrossCurrentActivity.Current.Activity = activity;
-        }
-
-        public void OnActivitySaveInstanceState(Activity activity, Bundle outState)
-        {
-        }
-
-        public void OnActivityStarted(Activity activity)
-        {
-            CrossCurrentActivity.Current.Activity = activity;
-        }
-
-        public void OnActivityStopped(Activity activity)
-        {
-        }
-
-        public static void StartPushService()
-        {
-            AppContext.StartService(new Intent(AppContext, typeof(PushNotificationService)));
-            if(Build.VERSION.SdkInt >= BuildVersionCodes.Kitkat)
-            {
-                PendingIntent pintent = PendingIntent.GetService(AppContext, 0, new Intent(AppContext,
-                    typeof(PushNotificationService)), 0);
-                AlarmManager alarm = (AlarmManager)AppContext.GetSystemService(AlarmService);
-                alarm.Cancel(pintent);
-            }
-        }
-
-        public static void StopPushService()
-        {
-            AppContext.StopService(new Intent(AppContext, typeof(PushNotificationService)));
-            if(Build.VERSION.SdkInt >= BuildVersionCodes.Kitkat)
-            {
-                PendingIntent pintent = PendingIntent.GetService(AppContext, 0, new Intent(AppContext,
-                    typeof(PushNotificationService)), 0);
-                AlarmManager alarm = (AlarmManager)AppContext.GetSystemService(AlarmService);
-                alarm.Cancel(pintent);
-            }
-        }
-
-        public static void SetIoc(Application application)
-        {
-            UserDialogs.Init(application);
-
-            var container = new UnityContainer();
-
-            container
-                // Android Stuff
-                .RegisterInstance(application.ApplicationContext)
-                .RegisterInstance<Application>(application)
-                // Services
-                .RegisterType<IDatabaseService, DatabaseService>(new ContainerControlledLifetimeManager())
-                .RegisterType<ISqlService, SqlService>(new ContainerControlledLifetimeManager())
-                .RegisterType<ISecureStorageService, KeyStoreStorageService>(new ContainerControlledLifetimeManager())
-                .RegisterType<ICryptoService, CryptoService>(new ContainerControlledLifetimeManager())
-                .RegisterType<IKeyDerivationService, BouncyCastleKeyDerivationService>(new ContainerControlledLifetimeManager())
-                .RegisterType<IAuthService, AuthService>(new ContainerControlledLifetimeManager())
-                .RegisterType<IFolderService, FolderService>(new ContainerControlledLifetimeManager())
-                .RegisterType<ILoginService, LoginService>(new ContainerControlledLifetimeManager())
-                .RegisterType<ISyncService, SyncService>(new ContainerControlledLifetimeManager())
-                .RegisterType<IClipboardService, ClipboardService>(new ContainerControlledLifetimeManager())
-                .RegisterType<IPushNotificationListener, PushNotificationListener>(new ContainerControlledLifetimeManager())
-                .RegisterType<IAppIdService, AppIdService>(new ContainerControlledLifetimeManager())
-                .RegisterType<IPasswordGenerationService, PasswordGenerationService>(new ContainerControlledLifetimeManager())
-                .RegisterType<IReflectionService, ReflectionService>(new ContainerControlledLifetimeManager())
-                .RegisterType<ILockService, LockService>(new ContainerControlledLifetimeManager())
-                .RegisterType<IAppInfoService, AppInfoService>(new ContainerControlledLifetimeManager())
-                .RegisterType<IGoogleAnalyticsService, GoogleAnalyticsService>(new ContainerControlledLifetimeManager())
-                .RegisterType<IDeviceInfoService, DeviceInfoService>(new ContainerControlledLifetimeManager())
-                .RegisterType<ILocalizeService, LocalizeService>(new ContainerControlledLifetimeManager())
-                .RegisterType<ILogService, LogService>(new ContainerControlledLifetimeManager())
-                .RegisterType<IHttpService, HttpService>(new ContainerControlledLifetimeManager())
-                .RegisterType<ITokenService, TokenService>(new ContainerControlledLifetimeManager())
-                .RegisterType<ISettingsService, SettingsService>(new ContainerControlledLifetimeManager())
-                .RegisterType<IMemoryService, MemoryService>(new ContainerControlledLifetimeManager())
-                // Repositories
-                .RegisterType<IFolderRepository, FolderRepository>(new ContainerControlledLifetimeManager())
-                .RegisterType<IFolderApiRepository, FolderApiRepository>(new ContainerControlledLifetimeManager())
-                .RegisterType<ILoginRepository, LoginRepository>(new ContainerControlledLifetimeManager())
-                .RegisterType<ILoginApiRepository, LoginApiRepository>(new ContainerControlledLifetimeManager())
-                .RegisterType<IConnectApiRepository, ConnectApiRepository>(new ContainerControlledLifetimeManager())
-                .RegisterType<IDeviceApiRepository, DeviceApiRepository>(new ContainerControlledLifetimeManager())
-                .RegisterType<IAccountsApiRepository, AccountsApiRepository>(new ContainerControlledLifetimeManager())
-                .RegisterType<ICipherApiRepository, CipherApiRepository>(new ContainerControlledLifetimeManager())
-                .RegisterType<ISettingsRepository, SettingsRepository>(new ContainerControlledLifetimeManager())
-                .RegisterType<ISettingsApiRepository, SettingsApiRepository>(new ContainerControlledLifetimeManager())
-                // Other
-                .RegisterInstance(CrossSettings.Current, new ContainerControlledLifetimeManager())
-                .RegisterInstance(CrossConnectivity.Current, new ContainerControlledLifetimeManager())
-                .RegisterInstance(UserDialogs.Instance, new ContainerControlledLifetimeManager())
-                .RegisterInstance(CrossFingerprint.Current, new ContainerControlledLifetimeManager());
-
-            CrossPushNotification.Initialize(container.Resolve<IPushNotificationListener>(), "962181367620");
-            container.RegisterInstance(CrossPushNotification.Current, new ContainerControlledLifetimeManager());
-            CachedImageRenderer.Init();
-
-            Resolver.SetResolver(new UnityResolver(container));
-            CrossFingerprint.SetCurrentActivityResolver(() => CrossCurrentActivity.Current.Activity);
+            var disableFavicon = await ServiceContainer.Resolve<IStorageService>("storageService").GetAsync<bool?>(
+                Constants.DisableFaviconKey);
+            await ServiceContainer.Resolve<IStateService>("stateService").SaveAsync(Constants.DisableFaviconKey,
+                disableFavicon);
+            await ServiceContainer.Resolve<IEnvironmentService>("environmentService").SetUrlsFromStorageAsync();
         }
     }
 }

src/Android/Migration/AndroidKeyStoreStorageService.cs

@@ -0,0 +1,373 @@
+using Java.Security;
+using Javax.Crypto;
+using Android.OS;
+using Bit.App.Abstractions;
+using System;
+using Android.Security;
+using Javax.Security.Auth.X500;
+using Java.Math;
+using Android.Security.Keystore;
+using Android.App;
+using Java.Util;
+using Javax.Crypto.Spec;
+using Android.Preferences;
+using Bit.App.Migration;
+using Bit.Core.Utilities;
+using Bit.App.Migration.Abstractions;
+
+namespace Bit.Droid.Migration
+{
+    public class AndroidKeyStoreStorageService : IOldSecureStorageService
+    {
+        private const string AndroidKeyStore = "AndroidKeyStore";
+        private const string AesMode = "AES/GCM/NoPadding";
+
+        private const string KeyAlias = "bitwardenKey2";
+        private const string KeyAliasV1 = "bitwardenKey";
+
+        private const string SettingsFormat = "ksSecured2:{0}";
+        private const string SettingsFormatV1 = "ksSecured:{0}";
+
+        private const string AesKey = "ksSecured2:aesKeyForService";
+        private const string AesKeyV1 = "ksSecured:aesKeyForService";
+
+        private readonly string _rsaMode;
+        private readonly bool _oldAndroid;
+        private readonly SettingsShim _settings;
+        private readonly KeyStore _keyStore;
+
+        public AndroidKeyStoreStorageService()
+        {
+            _oldAndroid = Build.VERSION.SdkInt < BuildVersionCodes.M;
+            _rsaMode = _oldAndroid ? "RSA/ECB/PKCS1Padding" : "RSA/ECB/OAEPWithSHA-1AndMGF1Padding";
+
+            _settings = ServiceContainer.Resolve<SettingsShim>("settingsShim");
+
+            _keyStore = KeyStore.GetInstance(AndroidKeyStore);
+            _keyStore.Load(null);
+
+            /*
+            try
+            {
+                GenerateStoreKey(true);
+            }
+            catch
+            {
+                GenerateStoreKey(false);
+            }
+
+            GenerateAesKey();
+            */
+        }
+
+        public bool Contains(string key)
+        {
+            return _settings.Contains(string.Format(SettingsFormat, key)) ||
+                _settings.Contains(string.Format(SettingsFormatV1, key));
+        }
+
+        public void Delete(string key)
+        {
+            CleanupOld(key);
+
+            var formattedKey = string.Format(SettingsFormat, key);
+            if(_settings.Contains(formattedKey))
+            {
+                _settings.Remove(formattedKey);
+            }
+        }
+
+        public byte[] Retrieve(string key)
+        {
+            var formattedKey = string.Format(SettingsFormat, key);
+            if(!_settings.Contains(formattedKey))
+            {
+                return TryGetAndMigrate(key);
+            }
+
+            var cs = _settings.GetValueOrDefault(formattedKey, null);
+            if(string.IsNullOrWhiteSpace(cs))
+            {
+                return null;
+            }
+
+            var aesKey = GetAesKey();
+            if(aesKey == null)
+            {
+                return null;
+            }
+
+            try
+            {
+                return App.Migration.Crypto.AesCbcDecrypt(new App.Migration.Models.CipherString(cs), aesKey);
+            }
+            catch
+            {
+                Console.WriteLine("Failed to decrypt from secure storage.");
+                _settings.Remove(formattedKey);
+                //Utilities.SendCrashEmail(e);
+                //Utilities.SaveCrashFile(e);
+                return null;
+            }
+        }
+
+        public void Store(string key, byte[] dataBytes)
+        {
+            var formattedKey = string.Format(SettingsFormat, key);
+            CleanupOld(key);
+            if(dataBytes == null)
+            {
+                _settings.Remove(formattedKey);
+                return;
+            }
+
+            var aesKey = GetAesKey();
+            if(aesKey == null)
+            {
+                return;
+            }
+
+            try
+            {
+                var cipherString = App.Migration.Crypto.AesCbcEncrypt(dataBytes, aesKey);
+                _settings.AddOrUpdateValue(formattedKey, cipherString.EncryptedString);
+            }
+            catch
+            {
+                Console.WriteLine("Failed to encrypt to secure storage.");
+                //Utilities.SendCrashEmail(e);
+                //Utilities.SaveCrashFile(e);
+            }
+        }
+
+        private void GenerateStoreKey(bool withDate)
+        {
+            if(_keyStore.ContainsAlias(KeyAlias))
+            {
+                return;
+            }
+
+            ClearSettings();
+
+            var end = Calendar.Instance;
+            end.Add(CalendarField.Year, 99);
+
+            if(_oldAndroid)
+            {
+                var subject = new X500Principal($"CN={KeyAlias}");
+
+                var builder = new KeyPairGeneratorSpec.Builder(Application.Context)
+                    .SetAlias(KeyAlias)
+                    .SetSubject(subject)
+                    .SetSerialNumber(BigInteger.Ten);
+
+                if(withDate)
+                {
+                    builder.SetStartDate(new Date(0)).SetEndDate(end.Time);
+                }
+
+                var spec = builder.Build();
+                var gen = KeyPairGenerator.GetInstance(KeyProperties.KeyAlgorithmRsa, AndroidKeyStore);
+                gen.Initialize(spec);
+                gen.GenerateKeyPair();
+            }
+            else
+            {
+                var builder = new KeyGenParameterSpec.Builder(KeyAlias, KeyStorePurpose.Decrypt | KeyStorePurpose.Encrypt)
+                    .SetBlockModes(KeyProperties.BlockModeGcm)
+                    .SetEncryptionPaddings(KeyProperties.EncryptionPaddingNone);
+
+                if(withDate)
+                {
+                    builder.SetKeyValidityStart(new Date(0)).SetKeyValidityEnd(end.Time);
+                }
+
+                var spec = builder.Build();
+                var gen = KeyGenerator.GetInstance(KeyProperties.KeyAlgorithmAes, AndroidKeyStore);
+                gen.Init(spec);
+                gen.GenerateKey();
+            }
+        }
+
+        private KeyStore.PrivateKeyEntry GetRsaKeyEntry(string alias)
+        {
+            return _keyStore.GetEntry(alias, null) as KeyStore.PrivateKeyEntry;
+        }
+
+        private void GenerateAesKey()
+        {
+            if(_settings.Contains(AesKey))
+            {
+                return;
+            }
+
+            var key = App.Migration.Crypto.RandomBytes(512 / 8);
+            var encKey = _oldAndroid ? RsaEncrypt(key) : AesEncrypt(key);
+            _settings.AddOrUpdateValue(AesKey, encKey);
+        }
+
+        private App.Migration.Models.SymmetricCryptoKey GetAesKey(bool v1 = false)
+        {
+            try
+            {
+                var aesKey = v1 ? AesKeyV1 : AesKey;
+                if(!_settings.Contains(aesKey))
+                {
+                    return null;
+                }
+
+                var encKey = _settings.GetValueOrDefault(aesKey, null);
+                if(string.IsNullOrWhiteSpace(encKey))
+                {
+                    return null;
+                }
+
+                if(_oldAndroid || v1)
+                {
+                    var encKeyBytes = Convert.FromBase64String(encKey);
+                    var key = RsaDecrypt(encKeyBytes, v1);
+                    return new App.Migration.Models.SymmetricCryptoKey(key);
+                }
+                else
+                {
+                    var parts = encKey.Split('|');
+                    if(parts.Length < 2)
+                    {
+                        return null;
+                    }
+
+                    var ivBytes = Convert.FromBase64String(parts[0]);
+                    var encKeyBytes = Convert.FromBase64String(parts[1]);
+                    var key = AesDecrypt(ivBytes, encKeyBytes);
+                    return new App.Migration.Models.SymmetricCryptoKey(key);
+                }
+            }
+            catch
+            {
+                Console.WriteLine("Cannot get AesKey.");
+                _keyStore.DeleteEntry(KeyAlias);
+                _settings.Remove(AesKey);
+                if(!v1)
+                {
+                    //Utilities.SendCrashEmail(e);
+                    //Utilities.SaveCrashFile(e);
+                }
+                return null;
+            }
+        }
+
+        private string AesEncrypt(byte[] input)
+        {
+            using(var entry = _keyStore.GetKey(KeyAlias, null))
+            using(var cipher = Cipher.GetInstance(AesMode))
+            {
+                cipher.Init(CipherMode.EncryptMode, entry);
+                var encBytes = cipher.DoFinal(input);
+                var ivBytes = cipher.GetIV();
+                return $"{Convert.ToBase64String(ivBytes)}|{Convert.ToBase64String(encBytes)}";
+            }
+        }
+
+        private byte[] AesDecrypt(byte[] iv, byte[] encData)
+        {
+            using(var entry = _keyStore.GetKey(KeyAlias, null))
+            using(var cipher = Cipher.GetInstance(AesMode))
+            {
+                var spec = new GCMParameterSpec(128, iv);
+                cipher.Init(CipherMode.DecryptMode, entry, spec);
+                var decBytes = cipher.DoFinal(encData);
+                return decBytes;
+            }
+        }
+
+        private string RsaEncrypt(byte[] data)
+        {
+            using(var entry = GetRsaKeyEntry(KeyAlias))
+            using(var cipher = Cipher.GetInstance(_rsaMode))
+            {
+                cipher.Init(CipherMode.EncryptMode, entry.Certificate.PublicKey);
+                var cipherText = cipher.DoFinal(data);
+                return Convert.ToBase64String(cipherText);
+            }
+        }
+
+        private byte[] RsaDecrypt(byte[] encData, bool v1)
+        {
+            using(var entry = GetRsaKeyEntry(v1 ? KeyAliasV1 : KeyAlias))
+            using(var cipher = Cipher.GetInstance(_rsaMode))
+            {
+                if(_oldAndroid)
+                {
+                    cipher.Init(CipherMode.DecryptMode, entry.PrivateKey);
+                }
+                else
+                {
+                    cipher.Init(CipherMode.DecryptMode, entry.PrivateKey, OAEPParameterSpec.Default);
+                }
+
+                var plainText = cipher.DoFinal(encData);
+                return plainText;
+            }
+        }
+
+        private byte[] TryGetAndMigrate(string key)
+        {
+            var formattedKeyV1 = string.Format(SettingsFormatV1, key);
+            if(_settings.Contains(formattedKeyV1))
+            {
+                var aesKeyV1 = GetAesKey(true);
+                if(aesKeyV1 != null)
+                {
+                    try
+                    {
+                        var cs = _settings.GetValueOrDefault(formattedKeyV1, null);
+                        var value = App.Migration.Crypto.AesCbcDecrypt(new App.Migration.Models.CipherString(cs), aesKeyV1);
+                        Store(key, value);
+                        return value;
+                    }
+                    catch
+                    {
+                        Console.WriteLine("Failed to decrypt v1 from secure storage.");
+                    }
+                }
+
+                _settings.Remove(formattedKeyV1);
+            }
+
+            return null;
+        }
+
+        private void CleanupOld(string key)
+        {
+            var formattedKeyV1 = string.Format(SettingsFormatV1, key);
+            if(_settings.Contains(formattedKeyV1))
+            {
+                _settings.Remove(formattedKeyV1);
+            }
+        }
+
+        private void ClearSettings(string format = SettingsFormat)
+        {
+            var prefix = string.Format(format, string.Empty);
+
+            using(var sharedPreferences = PreferenceManager.GetDefaultSharedPreferences(Application.Context))
+            using(var sharedPreferencesEditor = sharedPreferences.Edit())
+            {
+                var removed = false;
+                foreach(var pref in sharedPreferences.All)
+                {
+                    if(pref.Key.StartsWith(prefix))
+                    {
+                        removed = true;
+                        sharedPreferencesEditor.Remove(pref.Key);
+                    }
+                }
+
+                if(removed)
+                {
+                    sharedPreferencesEditor.Commit();
+                }
+            }
+        }
+    }
+}

src/Android/Properties/AndroidManifest.xml

@@ -1,14 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.x8bit.bitwarden" android:versionName="1.4.0" android:installLocation="auto" android:versionCode="101">
-  <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
+<manifest
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:versionCode="1"
+  android:versionName="2.0.4"
+  package="com.x8bit.bitwarden">
+
+  <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
+
   <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.NFC" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.CAMERA" />
   <uses-permission android:name="android.permission.USE_FINGERPRINT" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY" />
-  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-  <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-  <uses-permission android:name="com.x8bit.bitwarden.permission.C2D_MESSAGE" />
-  <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-  <application android:label="bitwarden" android:theme="@style/BitwardenTheme">
+
+  <uses-feature android:name="android.hardware.camera" android:required="false" />
+  <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
+
+  <application
+    android:label="Bitwarden"
+    android:theme="@style/LightTheme.Splash"
+    android:allowBackup="false"
+    tools:replace="android:allowBackup"
+    android:icon="@mipmap/ic_launcher"
+    android:roundIcon="@mipmap/ic_launcher_round"
+    android:networkSecurityConfig="@xml/network_security_config">
+    <provider
+      android:name="android.support.v4.content.FileProvider"
+      android:authorities="com.x8bit.bitwarden.fileprovider"
+      android:exported="false"
+      android:grantUriPermissions="true">
+      <meta-data
+        android:name="android.support.FILE_PROVIDER_PATHS"
+        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" />
   </application>
-</manifest>
+</manifest>

src/Android/Properties/AssemblyInfo.cs

@@ -1,7 +1,5 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using Android.App;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -10,8 +8,8 @@ using Android.App;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("8bit Solutions LLC")]
-[assembly: AssemblyProduct("bitwarden")]
-[assembly: AssemblyCopyright("Copyright © 2016")]
+[assembly: AssemblyProduct("Bitwarden")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
@@ -28,7 +26,3 @@ using Android.App;
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-
-// Add some common permissions, these can be removed if not needed
-[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
-[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]

src/Android/Push/FirebaseInstanceIdService.cs

@@ -0,0 +1,25 @@
+#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

@@ -0,0 +1,42 @@
+#if !FDROID
+using Android.App;
+using Android.Content;
+using Bit.App.Abstractions;
+using Bit.Core.Utilities;
+using Firebase.Messaging;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Xamarin.Forms;
+
+namespace Bit.Droid.Push
+{
+    [Service]
+    [IntentFilter(new[] { "com.google.firebase.MESSAGING_EVENT" })]
+    public class FirebaseMessagingService : Firebase.Messaging.FirebaseMessagingService
+    {
+        public async override void OnMessageReceived(RemoteMessage message)
+        {
+            if(message?.Data == null)
+            {
+                return;
+            }
+            var data = message.Data.ContainsKey("data") ? message.Data["data"] : null;
+            if(data == null)
+            {
+                return;
+            }
+            try
+            {
+                var obj = JObject.Parse(data);
+                var listener = ServiceContainer.Resolve<IPushNotificationListenerService>(
+                    "pushNotificationListenerService");
+                await listener.OnMessageAsync(obj, Device.Android);
+            }
+            catch(JsonReaderException ex)
+            {
+                System.Diagnostics.Debug.WriteLine(ex.ToString());
+            }
+        }
+    }
+}
+#endif

src/Android/Receivers/ClearClipboardAlarmReceiver.cs

@@ -0,0 +1,23 @@
+using Android.Content;
+using Bit.Core;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+
+namespace Bit.Droid.Receivers
+{
+    [BroadcastReceiver(Name = "com.x8bit.bitwarden.ClearClipboardAlarmReceiver", Exported = false)]
+    public class ClearClipboardAlarmReceiver : BroadcastReceiver
+    {
+        public async override void OnReceive(Context context, Intent intent)
+        {
+            var stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            var clipboardManager = context.GetSystemService(Context.ClipboardService) as ClipboardManager;
+            var lastClipboardValue = await stateService.GetAsync<string>(Constants.LastClipboardValueKey);
+            await stateService.RemoveAsync(Constants.LastClipboardValueKey);
+            if(lastClipboardValue == clipboardManager.Text)
+            {
+                clipboardManager.Text = string.Empty;
+            }
+        }
+    }
+}

src/Android/Receivers/LockAlarmReceiver.cs

@@ -0,0 +1,16 @@
+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 lockService = ServiceContainer.Resolve<ILockService>("lockService");
+            await lockService.CheckLockAsync();
+        }
+    }
+}

src/Android/Receivers/PackageReplacedReceiver.cs

@@ -0,0 +1,22 @@
+using System;
+using Android.App;
+using Android.Content;
+using Bit.App.Abstractions;
+using Bit.App.Utilities;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+
+namespace Bit.Droid.Receivers
+{
+    [BroadcastReceiver(Name = "com.x8bit.bitwarden.PackageReplacedReceiver", Exported = false)]
+    [IntentFilter(new[] { Intent.ActionMyPackageReplaced })]
+    public class PackageReplacedReceiver : BroadcastReceiver
+    {
+        public override async void OnReceive(Context context, Intent intent)
+        {
+            var storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            await AppHelpers.PerformUpdateTasksAsync(ServiceContainer.Resolve<ISyncService>("syncService"),
+                ServiceContainer.Resolve<IDeviceActionService>("deviceActionService"), storageService);
+        }
+    }
+}

src/Android/Renderers/CipherViewCellRenderer.cs

@@ -0,0 +1,241 @@
+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.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 AndroidCipherCell _cell;
+
+        protected override Android.Views.View GetCellCore(Cell item, Android.Views.View convertView,
+            ViewGroup parent, Context context)
+        {
+            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))
+            {
+                _textColor = ((Xamarin.Forms.Color)Xamarin.Forms.Application.Current.Resources["TextColor"])
+                    .ToAndroid();
+            }
+            if(_mutedColor == default(Android.Graphics.Color))
+            {
+                _mutedColor = ((Xamarin.Forms.Color)Xamarin.Forms.Application.Current.Resources["MutedColor"])
+                    .ToAndroid();
+            }
+            if(_disabledIconColor == default(Android.Graphics.Color))
+            {
+                _disabledIconColor =
+                    ((Xamarin.Forms.Color)Xamarin.Forms.Application.Current.Resources["DisabledIconColor"])
+                    .ToAndroid();
+            }
+
+            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/CustomEditorRenderer.cs

@@ -0,0 +1,28 @@
+using Android.Content;
+using Android.Views.InputMethods;
+using Bit.Droid.Renderers;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(Editor), typeof(CustomEditorRenderer))]
+namespace Bit.Droid.Renderers
+{
+    public class CustomEditorRenderer : EditorRenderer
+    {
+        public CustomEditorRenderer(Context context)
+            : base(context)
+        { }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<Editor> e)
+        {
+            base.OnElementChanged(e);
+            if(Control != null && e.NewElement != null)
+            {
+                Control.SetPadding(Control.PaddingLeft, Control.PaddingTop - 10, Control.PaddingRight,
+                    Control.PaddingBottom + 20);
+                Control.ImeOptions = Control.ImeOptions | (ImeAction)ImeFlags.NoPersonalizedLearning |
+                    (ImeAction)ImeFlags.NoExtractUi;
+            }
+        }
+    }
+}

src/Android/Renderers/CustomEntryRenderer.cs

@@ -0,0 +1,28 @@
+using Android.Content;
+using Android.Views.InputMethods;
+using Bit.Droid.Renderers;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(Entry), typeof(CustomEntryRenderer))]
+namespace Bit.Droid.Renderers
+{
+    public class CustomEntryRenderer : EntryRenderer
+    {
+        public CustomEntryRenderer(Context context)
+            : base(context)
+        { }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<Entry> e)
+        {
+            base.OnElementChanged(e);
+            if(Control != null && e.NewElement != null)
+            {
+                Control.SetPadding(Control.PaddingLeft, Control.PaddingTop - 10, Control.PaddingRight,
+                    Control.PaddingBottom + 20);
+                Control.ImeOptions = Control.ImeOptions | (ImeAction)ImeFlags.NoPersonalizedLearning |
+                    (ImeAction)ImeFlags.NoExtractUi;
+            }
+        }
+    }
+}

src/Android/Renderers/CustomPickerRenderer.cs

@@ -0,0 +1,25 @@
+using Android.Content;
+using Bit.Droid.Renderers;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(Picker), typeof(CustomPickerRenderer))]
+namespace Bit.Droid.Renderers
+{
+    public class CustomPickerRenderer : PickerRenderer
+    {
+        public CustomPickerRenderer(Context context)
+            : base(context)
+        { }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<Picker> e)
+        {
+            base.OnElementChanged(e);
+            if(Control != null && e.NewElement != null)
+            {
+                Control.SetPadding(Control.PaddingLeft, Control.PaddingTop - 10, Control.PaddingRight,
+                    Control.PaddingBottom + 20);
+            }
+        }
+    }
+}

src/Android/Renderers/CustomSearchBarRenderer.cs

@@ -0,0 +1,33 @@
+using Android.Content;
+using Android.Views.InputMethods;
+using Bit.Droid.Renderers;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(SearchBar), typeof(CustomSearchBarRenderer))]
+namespace Bit.Droid.Renderers
+{
+    public class CustomSearchBarRenderer : SearchBarRenderer
+    {
+        public CustomSearchBarRenderer(Context context)
+            : base(context)
+        { }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<SearchBar> e)
+        {
+            base.OnElementChanged(e);
+            if(Control != null && e.NewElement != null)
+            {
+                try
+                {
+                    var magId = Resources.GetIdentifier("android:id/search_mag_icon", null, null);
+                    var magImage = (Android.Widget.ImageView)Control.FindViewById(magId);
+                    magImage.LayoutParameters = new Android.Widget.LinearLayout.LayoutParams(0, 0);
+                }
+                catch { }
+                Control.SetImeOptions(Control.ImeOptions | (ImeAction)ImeFlags.NoPersonalizedLearning |
+                    (ImeAction)ImeFlags.NoExtractUi);
+            }
+        }
+    }
+}

src/Android/Renderers/ExtendedListViewRenderer.cs

@@ -0,0 +1,29 @@
+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/ExtendedSliderRenderer.cs

@@ -0,0 +1,33 @@
+using Android.Content;
+using Android.Graphics.Drawables;
+using Android.Support.V4.Content.Res;
+using Bit.App.Controls;
+using Bit.Droid.Renderers;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(ExtendedSlider), typeof(ExtendedSliderRenderer))]
+namespace Bit.Droid.Renderers
+{
+    public class ExtendedSliderRenderer : SliderRenderer
+    {
+        public ExtendedSliderRenderer(Context context)
+            : base(context)
+        {}
+
+        protected override void OnElementChanged(ElementChangedEventArgs<Slider> e)
+        {
+            base.OnElementChanged(e);
+            if(Control != null && Element is ExtendedSlider view)
+            {
+                var t = ResourcesCompat.GetDrawable(Resources, Resource.Drawable.slider_thumb, null);
+                if(t is GradientDrawable thumb)
+                {
+                    thumb.SetColor(view.ThumbColor.ToAndroid());
+                    thumb.SetStroke(3, view.ThumbBorderColor.ToAndroid());
+                    Control.SetThumb(thumb);
+                }
+            }
+        }
+    }
+}

src/Android/Renderers/HybridWebViewRenderer.cs

@@ -0,0 +1,98 @@
+using System;
+using Bit.App.Controls;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+using Android.Webkit;
+using AWebkit = Android.Webkit;
+using Java.Interop;
+using Android.Content;
+using Bit.Droid.Renderers;
+using System.ComponentModel;
+
+[assembly: ExportRenderer(typeof(HybridWebView), typeof(HybridWebViewRenderer))]
+namespace Bit.Droid.Renderers
+{
+    public class HybridWebViewRenderer : ViewRenderer<HybridWebView, AWebkit.WebView>
+    {
+        private const string JSFunction = "function invokeCSharpAction(data){jsBridge.invokeAction(data);}";
+
+        private readonly Context _context;
+
+        public HybridWebViewRenderer(Context context)
+            : base(context)
+        {
+            _context = context;
+        }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<HybridWebView> e)
+        {
+            base.OnElementChanged(e);
+
+            if(Control == null)
+            {
+                var webView = new AWebkit.WebView(_context);
+                webView.Settings.JavaScriptEnabled = true;
+                webView.SetWebViewClient(new JSWebViewClient(string.Format("javascript: {0}", JSFunction)));
+                SetNativeControl(webView);
+            }
+            if(e.OldElement != null)
+            {
+                Control.RemoveJavascriptInterface("jsBridge");
+                var hybridWebView = e.OldElement as HybridWebView;
+                hybridWebView.Cleanup();
+            }
+            if(e.NewElement != null)
+            {
+                Control.AddJavascriptInterface(new JSBridge(this), "jsBridge");
+                Control.LoadUrl(Element.Uri);
+            }
+        }
+
+        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            base.OnElementPropertyChanged(sender, e);
+            if(e.PropertyName == HybridWebView.UriProperty.PropertyName)
+            {
+                Control.LoadUrl(Element.Uri);
+            }
+        }
+
+        public class JSBridge : Java.Lang.Object
+        {
+            private readonly WeakReference<HybridWebViewRenderer> _hybridWebViewRenderer;
+
+            public JSBridge(HybridWebViewRenderer hybridRenderer)
+            {
+                _hybridWebViewRenderer = new WeakReference<HybridWebViewRenderer>(hybridRenderer);
+            }
+
+            [JavascriptInterface]
+            [Export("invokeAction")]
+            public void InvokeAction(string data)
+            {
+                if(_hybridWebViewRenderer != null &&
+                    _hybridWebViewRenderer.TryGetTarget(out HybridWebViewRenderer hybridRenderer))
+                {
+                    hybridRenderer.Element.InvokeAction(data);
+                }
+            }
+        }
+
+        public class JSWebViewClient : WebViewClient
+        {
+            private readonly string _javascript;
+
+            public JSWebViewClient(string javascript)
+            {
+                _javascript = javascript;
+
+            }
+
+            public override void OnPageFinished(AWebkit.WebView view, string url)
+            {
+                base.OnPageFinished(view, url);
+                view.EvaluateJavascript(_javascript, null);
+            }
+        }
+    }
+}

src/Android/Resources/AboutResources.txt

@@ -1,50 +0,0 @@
-Images, layout descriptions, binary blobs and string dictionaries can be included 
-in your application as resource files.  Various Android APIs are designed to 
-operate on the resource IDs instead of dealing with images, strings or binary blobs 
-directly.
-
-For example, a sample Android app that contains a user interface layout (main.xml),
-an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
-would keep its resources in the "Resources" directory of the application:
-
-Resources/
-    drawable-hdpi/
-        icon.png
-
-    drawable-ldpi/
-        icon.png
-
-    drawable-mdpi/
-        icon.png
-
-    layout/
-        main.xml
-
-    values/
-        strings.xml
-
-In order to get the build system to recognize Android resources, set the build action to
-"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
-instead operate on resource IDs.  When you compile an Android application that uses resources, 
-the build system will package the resources for distribution and generate a class called
-"Resource" that contains the tokens for each one of the resources included. For example, 
-for the above Resources layout, this is what the Resource class would expose:
-
-public class Resource {
-    public class drawable {
-        public const int icon = 0x123;
-    }
-
-    public class layout {
-        public const int main = 0x456;
-    }
-
-    public class strings {
-        public const int first_string = 0xabc;
-        public const int second_string = 0xbcd;
-    }
-}
-
-You would then use R.drawable.icon to reference the drawable/icon.png file, or Resource.layout.main 
-to reference the layout/main.xml file, or Resource.strings.first_string to reference the first 
-string in the dictionary file values/strings.xml.