new hi-res icon for store

* New translations AppResources.resx (Chinese Traditional)

* New translations AppResources.resx (Portuguese)

* New translations AppResources.resx (Portuguese, Brazilian)

.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

README.md

@@ -4,9 +4,9 @@
 
 # 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, UWP, 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.png" alt="" width="300" height="533" /> <img src="https://raw.githubusercontent.com/bitwarden/brand/master/screenshots/mobile-ios.png" alt="" width="300" height="533" />
 
@@ -14,21 +14,18 @@ The Bitwarden mobile application is written in C# with Xamarin Android, Xamarin
 
 **Requirements**
 
-- [Visual Studio](https://store.xamarin.com/)
+- [Visual Studio](https://visualstudio.microsoft.com/)
-
+- [Xamarin](https://docs.microsoft.com/en-us/xamarin/get-started/installation/?pivots=windows)
-**API endpoint**
-
-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 instance. Open `src/App/Utilities/ApiHttpClient.cs` and `src/App/Utilities/IdentityHttpClient.cs` and set the `BaseAddress` to your local
-API endpoints (ex. `new Uri("http://localhost:5000")`). Alternatively, you can also adjust the environment endpoints from the environment settings page on the home screen of the app (log out).
 
 **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. You can read our security policy in the [`SECURITY.md`](SECURITY.md) file.

appveyor.yml

@@ -1,29 +1,143 @@
-#init:
+image:
-#  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+- Visual Studio 2017
-#on_finish:
+- Ubuntu1804
-#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+
-#install:
-#  - choco install cloc --no-progress
-#  - "cloc --vcs git --exclude-dir Resources,store,test,UWP,Properties --include-lang C#,JavaScript,TypeScript,PowerShell"
-#  - appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
-#  - appveyor DownloadFile https://aka.ms/vs/15/release/vs_community.exe
-#  - vs_community.exe update --wait --quiet --norestart --installPath "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community"
-#  - ps: .\src\Android\update-android.ps1
-before_build:
-  - nuget restore
-  - IF DEFINED keystore_dec_secret nuget install secure-file -ExcludeVersion
-  - IF DEFINED google_services_dec_secret secure-file\tools\secure-file -decrypt src\Android\google-services.json.enc -secret %google_services_dec_secret%
-after_build:
-  - ps: IF($env:keystore_dec_secret) { .\src\Android\ci-build-apks.ps1 }
-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 dotnet store\google\Publisher\bin\Release\netcoreapp2.0\Publisher.dll %APPVEYOR_BUILD_FOLDER%\store\google\Publisher\play_creds.json %APPVEYOR_BUILD_FOLDER%\com.x8bit.bitwarden-%APPVEYOR_BUILD_NUMBER%.apk alpha
-artifacts:
-  - path: com.x8bit.bitwarden-%APPVEYOR_BUILD_NUMBER%.apk
-  - path: com.x8bit.bitwarden-fdroid-%APPVEYOR_BUILD_NUMBER%.apk
 branches:
   except:
     - l10n_master
-skip_tags: true
+    - gh-pages
+
 configuration: Release
-image: Visual Studio 2017
+
+stack: node 10
+
+init:
+- sh: |
+    if [ "${DEBUG_SSH}" == "true" ]
+    then
+      curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -
+    fi
+- ps: |
+    if($isWindows -and $env:DEBUG_RDP -eq "true") {
+      iex ((new-object net.webclient).DownloadString(`
+        'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+    }
+- ps: |
+    if($env:APPVEYOR_REPO_TAG -eq "true") {
+      $tagName = $env:APPVEYOR_REPO_TAG_NAME.TrimStart("v")
+      $env:RELEASE_NAME = "Version ${tagName}"
+    }
+
+install:
+- sh: |
+    curl -sflL 'https://raw.githubusercontent.com/appveyor/secure-file/master/install.sh' | bash -e -
+    ./appveyor-tools/secure-file -decrypt ./store/fdroid/keystore.jks.enc -secret $FDROID_KEYSTORE_ENC_PASSWORD
+- sh: npm install
+- sh: |
+    sudo apt-get -qq update
+    sudo apt-get -qqy install --no-install-recommends fdroidserver wget
+- sh: |
+    if [ "${APPVEYOR_REPO_TAG}" == "true" -a "${GH_TOKEN}" != "" ]
+    then
+      git config --global credential.helper store
+      echo "https://${GH_TOKEN}:x-oauth-basic@github.com" >> ~/.git-credentials
+      git config --global user.email "ci@bitwarden.com"
+      git config --global user.name "Bitwarden CI"
+    fi
+- cmd: choco install cloc --no-progress
+- cmd: "cloc --vcs git --exclude-dir Resources,store,test,Properties --include-lang C#,XAML"
+#- cmd: appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
+#- cmd: appveyor DownloadFile https://aka.ms/vs/15/release/vs_community.exe
+#- cmd: vs_community.exe update --wait --quiet --norestart --installPath "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community"
+#- cmd: ps: .\src\Android\update-android.ps1
+
+before_build:
+- ps: |
+    if($isWindows) {
+      nuget restore
+      if($env: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:
+- 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,523 +1,306 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2010
+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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0D790714-ECF8-4A83-BE4A-E9C84DD1BB5D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\Core.csproj", "{4B8A8C41-9820-4341-974C-41E65B7F4366}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EC730FD9-F623-4B6C-B503-95CDCFBCF277}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playground", "test\Playground\Playground.csproj", "{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "App.Test", "test\App.Test\App.Test.csproj", "{A300DCE1-8D10-4267-B96A-CB01AEB7C220}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D10CA4A9-F866-40E1-B658-F69051236C71}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Extension", "src\iOS.Extension\iOS.Extension.csproj", "{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8904C536-C67D-420F-9971-51B26574C3AA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Core", "src\iOS.Core\iOS.Core.csproj", "{B2538ADA-B605-4D6F-ACD2-62A409680F84}"
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App", "src\App\App.csproj", "{8A279EE4-4537-4656-9C93-44945E594556}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{76690DFB-B7F4-4781-83E4-113FDC450AFE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Publisher", "store\google\Publisher\Publisher.csproj", "{D5D91152-CB01-4F24-A503-304D3A94408B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F0E2E596-C3DB-474A-9C88-7824662894FA}"
 	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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Autofill", "src\iOS.Autofill\iOS.Autofill.csproj", "{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}"
+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|ARM = FDroid|ARM
 		FDroid|iPhone = FDroid|iPhone
 		FDroid|iPhoneSimulator = FDroid|iPhoneSimulator
-		FDroid|x64 = FDroid|x64
-		FDroid|x86 = FDroid|x86
 		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
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|ARM.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|x64.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|x64.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Ad-Hoc|x86.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhone.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|ARM.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|ARM.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|x64.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|x64.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|x86.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.AppStore|x86.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|Any CPU.Deploy.0 = FDroid|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhone.Build.0 = FDroid|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|ARM.Build.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhone.Deploy.0 = FDroid|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|ARM.Deploy.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhoneSimulator.Deploy.0 = FDroid|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|x86.Build.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Debug|x86.Deploy.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhone.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|Any CPU.Deploy.0 = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|ARM.ActiveCfg = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|ARM.Build.0 = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|ARM.Deploy.0 = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|iPhone.Build.0 = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|Any CPU.Deploy.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|iPhone.Deploy.0 = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhone.Deploy.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|iPhoneSimulator.Deploy.0 = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|x64.ActiveCfg = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|x64.Build.0 = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|x64.Deploy.0 = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|x86.ActiveCfg = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|x86.Build.0 = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|Any CPU.Deploy.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.FDroid|x86.Deploy.0 = FDroid|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhone.Deploy.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|ARM.ActiveCfg = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|ARM.Build.0 = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|ARM.Deploy.0 = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|x64.ActiveCfg = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|x64.Build.0 = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|x64.Deploy.0 = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|x86.ActiveCfg = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|x86.Build.0 = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0}.Release|x86.Deploy.0 = Release|Any CPU
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|iPhone.Build.0 = FDroid|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.AppStore|ARM.ActiveCfg = AppStore|iPhone
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhone.Build.0 = Release|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.AppStore|iPhone.Build.0 = AppStore|iPhone
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.AppStore|x64.ActiveCfg = AppStore|iPhone
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.AppStore|x86.ActiveCfg = AppStore|iPhone
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|Any CPU.ActiveCfg = Debug|iPhone
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|ARM.ActiveCfg = Debug|iPhone
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|iPhone.Build.0 = Debug|iPhone
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|x64.ActiveCfg = Debug|iPhone
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|x86.ActiveCfg = Debug|iPhone
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Debug|x86.Build.0 = Debug|iPhone
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.FDroid|Any CPU.ActiveCfg = Release|iPhoneSimulator
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.FDroid|Any CPU.Build.0 = Release|iPhoneSimulator
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.FDroid|ARM.ActiveCfg = Release|iPhoneSimulator
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.FDroid|ARM.Build.0 = Release|iPhoneSimulator
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.FDroid|iPhone.ActiveCfg = Release|iPhone
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.FDroid|iPhone.Build.0 = Release|iPhone
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.FDroid|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.FDroid|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.FDroid|x64.ActiveCfg = Release|iPhoneSimulator
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.FDroid|x64.Build.0 = Release|iPhoneSimulator
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.FDroid|x86.ActiveCfg = Release|iPhoneSimulator
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.FDroid|x86.Build.0 = Release|iPhoneSimulator
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|iPhone.Build.0 = FDroid|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Release|Any CPU.ActiveCfg = Release|iPhone
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Release|ARM.ActiveCfg = Release|iPhone
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Release|iPhone.ActiveCfg = Release|iPhone
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Release|iPhone.Build.0 = Release|iPhone
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|iPhone.Build.0 = Release|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Release|x64.ActiveCfg = Release|iPhone
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{1F78403F-9A28-405B-9289-B9DBEB55F074}.Release|x86.ActiveCfg = Release|iPhone
+		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|x64.Build.0 = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|ARM.Build.0 = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|x64.Build.0 = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.AppStore|x86.Build.0 = Release|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|iPhone.Build.0 = FDroid|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|ARM.Build.0 = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|iPhone.Build.0 = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Debug|x86.Build.0 = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.FDroid|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.FDroid|Any CPU.Build.0 = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.FDroid|ARM.ActiveCfg = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.FDroid|ARM.Build.0 = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.FDroid|iPhone.ActiveCfg = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.FDroid|iPhone.Build.0 = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.FDroid|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.FDroid|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.FDroid|x64.ActiveCfg = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.FDroid|x64.Build.0 = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.FDroid|x86.ActiveCfg = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.FDroid|x86.Build.0 = Debug|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|Any CPU.Build.0 = Release|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|ARM.ActiveCfg = Release|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|ARM.Build.0 = Release|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|x64.ActiveCfg = Release|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|x64.Build.0 = Release|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|x86.ActiveCfg = Release|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220}.Release|x86.Build.0 = Release|Any CPU
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|iPhone.Build.0 = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhone.Build.0 = Release|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.AppStore|ARM.ActiveCfg = AppStore|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|Any CPU.ActiveCfg = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|Any CPU.Build.0 = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.AppStore|iPhone.Build.0 = AppStore|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.ActiveCfg = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.Build.0 = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.AppStore|x64.ActiveCfg = AppStore|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.Build.0 = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.AppStore|x86.ActiveCfg = AppStore|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|Any CPU.ActiveCfg = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|Any CPU.ActiveCfg = Debug|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|Any CPU.Build.0 = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|ARM.ActiveCfg = Debug|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.ActiveCfg = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.Build.0 = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|iPhone.Build.0 = Debug|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.Build.0 = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|x64.ActiveCfg = Debug|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|x86.ActiveCfg = Debug|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Debug|x86.Build.0 = Debug|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.FDroid|Any CPU.ActiveCfg = Release|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.FDroid|Any CPU.Build.0 = Release|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.FDroid|ARM.ActiveCfg = Release|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.FDroid|ARM.Build.0 = Release|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.FDroid|iPhone.ActiveCfg = Release|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.FDroid|iPhone.Build.0 = Release|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhone.Build.0 = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.FDroid|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.FDroid|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.FDroid|x64.ActiveCfg = Release|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.FDroid|x64.Build.0 = Release|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.FDroid|x86.ActiveCfg = Release|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.FDroid|x86.Build.0 = Release|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhone.Build.0 = Release|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Release|Any CPU.ActiveCfg = Release|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Release|ARM.ActiveCfg = Release|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Release|iPhone.ActiveCfg = Release|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Release|iPhone.Build.0 = Release|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Release|x64.ActiveCfg = Release|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422}.Release|x86.ActiveCfg = Release|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|Any CPU.ActiveCfg = Debug|iPhone
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhone.Build.0 = Debug|iPhone
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|x64.Build.0 = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|Any CPU.ActiveCfg = FDroid|iPhone
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhone.ActiveCfg = FDroid|iPhone
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhone.Build.0 = FDroid|iPhone
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|iPhoneSimulator
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhoneSimulator.Build.0 = FDroid|iPhoneSimulator
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|Any CPU.ActiveCfg = Release|iPhone
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|ARM.Build.0 = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhone.ActiveCfg = Release|iPhone
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhone.Build.0 = Release|iPhone
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{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|x86.ActiveCfg = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.Debug|x86.Build.0 = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.FDroid|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.FDroid|Any CPU.Build.0 = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.FDroid|ARM.ActiveCfg = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.FDroid|ARM.Build.0 = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.FDroid|iPhone.ActiveCfg = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.FDroid|iPhone.Build.0 = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.FDroid|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.FDroid|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.FDroid|x64.ActiveCfg = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.FDroid|x64.Build.0 = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.FDroid|x86.ActiveCfg = Debug|Any CPU
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84}.FDroid|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
-		{8A279EE4-4537-4656-9C93-44945E594556}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.AppStore|x64.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.AppStore|x86.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Debug|ARM.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Debug|x64.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Debug|x86.Build.0 = Debug|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.FDroid|ARM.ActiveCfg = FDroid|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.FDroid|ARM.Build.0 = FDroid|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.FDroid|iPhone.Build.0 = FDroid|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.FDroid|x64.ActiveCfg = FDroid|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.FDroid|x64.Build.0 = FDroid|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.FDroid|x86.ActiveCfg = FDroid|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.FDroid|x86.Build.0 = FDroid|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Release|ARM.ActiveCfg = Release|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Release|ARM.Build.0 = Release|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Release|iPhone.Build.0 = Release|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Release|x64.ActiveCfg = Release|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Release|x64.Build.0 = Release|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Release|x86.ActiveCfg = Release|Any CPU
-		{8A279EE4-4537-4656-9C93-44945E594556}.Release|x86.Build.0 = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.AppStore|x64.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.AppStore|x86.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Debug|ARM.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Debug|x64.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Debug|x86.Build.0 = Debug|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.FDroid|Any CPU.ActiveCfg = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.FDroid|Any CPU.Build.0 = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.FDroid|ARM.ActiveCfg = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.FDroid|ARM.Build.0 = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.FDroid|iPhone.ActiveCfg = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.FDroid|iPhone.Build.0 = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.FDroid|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.FDroid|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.FDroid|x64.ActiveCfg = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.FDroid|x64.Build.0 = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.FDroid|x86.ActiveCfg = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.FDroid|x86.Build.0 = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Release|ARM.ActiveCfg = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Release|ARM.Build.0 = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Release|iPhone.Build.0 = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Release|x64.ActiveCfg = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Release|x64.Build.0 = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Release|x86.ActiveCfg = Release|Any CPU
-		{D5D91152-CB01-4F24-A503-304D3A94408B}.Release|x86.Build.0 = Release|Any CPU
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.AppStore|ARM.ActiveCfg = AppStore|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.AppStore|x64.ActiveCfg = AppStore|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.AppStore|x86.ActiveCfg = AppStore|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Debug|Any CPU.ActiveCfg = Debug|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Debug|ARM.ActiveCfg = Debug|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Debug|iPhone.Build.0 = Debug|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Debug|x64.ActiveCfg = Debug|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Debug|x86.ActiveCfg = Debug|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.FDroid|Any CPU.ActiveCfg = AppStore|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.FDroid|Any CPU.Build.0 = AppStore|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.FDroid|ARM.ActiveCfg = AppStore|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.FDroid|ARM.Build.0 = AppStore|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.FDroid|iPhone.ActiveCfg = AppStore|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.FDroid|iPhone.Build.0 = AppStore|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.FDroid|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.FDroid|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.FDroid|x64.ActiveCfg = AppStore|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.FDroid|x64.Build.0 = AppStore|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.FDroid|x86.ActiveCfg = AppStore|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.FDroid|x86.Build.0 = AppStore|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Release|Any CPU.ActiveCfg = Release|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Release|ARM.ActiveCfg = Release|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Release|iPhone.ActiveCfg = Release|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Release|iPhone.Build.0 = Release|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Release|x64.ActiveCfg = Release|iPhone
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F}.Release|x86.ActiveCfg = Release|iPhone
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{04B18ED2-B76D-4947-8474-191F8FD2B5E0} = {EC730FD9-F623-4B6C-B503-95CDCFBCF277}
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F} = {D10CA4A9-F866-40E1-B658-F69051236C71}
-		{1F78403F-9A28-405B-9289-B9DBEB55F074} = {EC730FD9-F623-4B6C-B503-95CDCFBCF277}
+		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C} = {D10CA4A9-F866-40E1-B658-F69051236C71}
-		{A300DCE1-8D10-4267-B96A-CB01AEB7C220} = {0D790714-ECF8-4A83-BE4A-E9C84DD1BB5D}
+		{4B8A8C41-9820-4341-974C-41E65B7F4366} = {D10CA4A9-F866-40E1-B658-F69051236C71}
-		{32F5A2D6-F54D-4DA1-AE26-0A980D48F422} = {EC730FD9-F623-4B6C-B503-95CDCFBCF277}
+		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3} = {8904C536-C67D-420F-9971-51B26574C3AA}
-		{B2538ADA-B605-4D6F-ACD2-62A409680F84} = {EC730FD9-F623-4B6C-B503-95CDCFBCF277}
 		{2E399654-26A2-46F6-B9CA-1B496A3F370A} = {92470CBD-9047-4C3C-8EA3-D972D6622D84}
-		{8A279EE4-4537-4656-9C93-44945E594556} = {EC730FD9-F623-4B6C-B503-95CDCFBCF277}
+		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D} = {2E399654-26A2-46F6-B9CA-1B496A3F370A}
-		{D5D91152-CB01-4F24-A503-304D3A94408B} = {2E399654-26A2-46F6-B9CA-1B496A3F370A}
+		{E71F3053-056C-4381-9638-048ED73BDFF6} = {D10CA4A9-F866-40E1-B658-F69051236C71}
-		{C2B7ADCA-5964-43C5-A7C8-D3B6F8023F4F} = {EC730FD9-F623-4B6C-B503-95CDCFBCF277}
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15} = {D10CA4A9-F866-40E1-B658-F69051236C71}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {318CB2DF-0118-43A3-AC83-56BADCF71CCD}
+		SolutionGuid = {7D436EA3-8B7E-45D2-8D14-0730BD2E0410}
 	EndGlobalSection
 EndGlobal

crowdin.yml

@@ -8,6 +8,7 @@ files:
         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
@@ -17,6 +18,7 @@ files:
         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
@@ -26,3 +28,4 @@ files:
         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

@@ -5,16 +5,14 @@ using Android.Runtime;
 using Android.Views;
 using System;
 
-namespace Bit.Android
+namespace Bit.Droid.Accessibility
 {
-    [Activity(Theme = "@style/BitwardenTheme.Splash", WindowSoftInputMode = SoftInput.StateHidden)]
+    [Activity(Theme = "@style/LightTheme.Splash", WindowSoftInputMode = SoftInput.StateHidden)]
-    public class AutofillActivity : Activity
+    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);
@@ -40,7 +38,6 @@ namespace Bit.Android
                 Finish();
                 return;
             }
-
             Intent.RemoveExtra("uri");
         }
 
@@ -49,7 +46,7 @@ namespace Bit.Android
             base.OnActivityResult(requestCode, resultCode, data);
             if(data == null)
             {
-                LastCredentials = null;
+                AccessibilityHelpers.LastCredentials = null;
             }
             else
             {
@@ -57,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");
-
+                        AccessibilityHelpers.LastCredentials = new Credentials
-                        LastCredentials = new AutofillCredentials
                         {
                             Username = username,
                             Password = password,
@@ -76,10 +72,9 @@ namespace Bit.Android
                 }
                 catch
                 {
-                    LastCredentials = null;
+                    AccessibilityHelpers.LastCredentials = null;
                 }
             }
-
             Finish();
         }
 
@@ -91,9 +86,8 @@ namespace Bit.Android
                 Finish();
                 return;
             }
-
             var now = DateTime.UtcNow;
-            if(_lastLaunch.HasValue && (now - _lastLaunch.Value <= TimeSpan.FromSeconds(2)))
+            if(_lastLaunch.HasValue && (now - _lastLaunch.Value) <= TimeSpan.FromSeconds(2))
             {
                 return;
             }

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

@@ -1,17 +1,16 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using Android.Content;
 using Android.Service.Autofill;
 using Android.Widget;
 using System.Linq;
 using Android.App;
-using Bit.App.Abstractions;
 using System.Threading.Tasks;
 using Bit.App.Resources;
-using Bit.App.Enums;
+using Bit.Core.Enums;
 using Android.Views.Autofill;
+using Bit.Core.Abstractions;
 
-namespace Bit.Android.Autofill
+namespace Bit.Droid.Autofill
 {
     public static class AutofillHelpers
     {
@@ -20,66 +19,92 @@ namespace Bit.Android.Autofill
         // 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"
+            "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",
+            "org.mozilla.firefox",
-            "com.chrome.beta","com.android.browser","com.brave.browser","com.opera.browser",
+            "org.mozilla.firefox_beta",
-            "com.opera.browser.beta","com.opera.mini.native","com.chrome.dev","com.chrome.canary",
+            "com.microsoft.emmx",
-            "com.google.android.apps.chrome","com.google.android.apps.chrome_dev","com.yandex.browser",
+            "com.android.chrome",
-            "com.sec.android.app.sbrowser","com.sec.android.app.sbrowser.beta","org.codeaurora.swe.browser",
+            "com.chrome.beta",
-            "com.amazon.cloud9","mark.via.gp","org.bromite.bromite","org.chromium.chrome","com.kiwibrowser.browser",
+            "com.android.browser",
-            "com.ecosia.android", "com.opera.mini.native.beta","org.mozilla.fennec_aurora"
+            "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",
         };
 
-        public static async Task<List<FilledItem>> GetFillItemsAsync(Parser parser, ICipherService service)
+        // The URLs are blacklisted from autofilling
+        public static HashSet<string> BlacklistedUris = new HashSet<string>
         {
-            var items = new List<FilledItem>();
+            "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 service.GetAllAsync(parser.Uri);
+                var ciphers = await cipherService.GetAllDecryptedByUrlAsync(parser.Uri);
                 if(ciphers.Item1.Any() || ciphers.Item2.Any())
                 {
                     var allCiphers = ciphers.Item1.ToList();
                     allCiphers.AddRange(ciphers.Item2.ToList());
-                    foreach(var cipher in allCiphers)
+                    return allCiphers.Select(c => new FilledItem(c)).ToList();
-                    {
-                        items.Add(new FilledItem(cipher));
-                    }
                 }
             }
             else if(parser.FieldCollection.FillableForCard)
             {
-                var ciphers = await service.GetAllAsync();
+                var ciphers = await cipherService.GetAllDecryptedAsync();
-                foreach(var cipher in ciphers.Where(c => c.Type == CipherType.Card))
+                return ciphers.Where(c => c.Type == CipherType.Card).Select(c => new FilledItem(c)).ToList();
-                {
-                    items.Add(new FilledItem(cipher));
-                }
             }
-
+            return new List<FilledItem>();
-            return items;
         }
 
-        public static FillResponse BuildFillResponse(Context context, Parser parser, List<FilledItem> items, bool locked)
+        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(context, parser.FieldCollection, item);
+                    var dataset = BuildDataset(parser.ApplicationContext, parser.FieldCollection, item);
                     if(dataset != null)
                     {
                         responseBuilder.AddDataset(dataset);
                     }
                 }
             }
-
+            responseBuilder.AddDataset(BuildVaultDataset(parser.ApplicationContext, parser.FieldCollection,
-            responseBuilder.AddDataset(BuildVaultDataset(context, parser.FieldCollection, parser.Uri, locked));
+                parser.Uri, locked));
             AddSaveInfo(parser, responseBuilder, parser.FieldCollection);
             responseBuilder.SetIgnoredIds(parser.FieldCollection.IgnoreAutofillIds.ToArray());
             return responseBuilder.Build();
@@ -88,7 +113,7 @@ namespace Bit.Android.Autofill
         public static Dataset BuildDataset(Context context, FieldCollection fields, FilledItem filledItem)
         {
             var datasetBuilder = new Dataset.Builder(
-                BuildListView(context.PackageName, filledItem.Name, filledItem.Subtitle, filledItem.Icon));
+                BuildListView(filledItem.Name, filledItem.Subtitle, filledItem.Icon, context));
             if(filledItem.ApplyToFields(fields, datasetBuilder))
             {
                 return datasetBuilder.Build();
@@ -120,8 +145,11 @@ namespace Bit.Android.Autofill
             var pendingIntent = PendingIntent.GetActivity(context, ++_pendingIntentId, intent,
                 PendingIntentFlags.CancelCurrent);
 
-            var view = BuildListView(context.PackageName, AppResources.AutofillWithBitwarden,
+            var view = BuildListView(
-                locked ? AppResources.VaultIsLocked : AppResources.GoToMyVault, Resource.Drawable.icon);
+                AppResources.AutofillWithBitwarden,
+                locked ? AppResources.VaultIsLocked : AppResources.GoToMyVault,
+                Resource.Drawable.icon,
+                context);
 
             var datasetBuilder = new Dataset.Builder(view);
             datasetBuilder.SetAuthentication(pendingIntent.IntentSender);
@@ -131,14 +159,14 @@ namespace Bit.Android.Autofill
             {
                 datasetBuilder.SetValue(autofillId, AutofillValue.ForText("PLACEHOLDER"));
             }
-
             return datasetBuilder.Build();
         }
 
-        public static RemoteViews BuildListView(string packageName, string text, string subtext, int iconId)
+        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.text, text);
+            view.SetTextViewText(Resource.Id.text1, text);
             view.SetTextViewText(Resource.Id.text2, subtext);
             view.SetImageViewResource(Resource.Id.icon, iconId);
             return view;
@@ -173,4 +201,4 @@ namespace Bit.Android.Autofill
             responseBuilder.SetSaveInfo(saveBuilder.Build());
         }
     }
-}
+}

src/Android/Autofill/AutofillService.cs

@@ -5,25 +5,27 @@ using Android.OS;
 using Android.Runtime;
 using Android.Service.Autofill;
 using Android.Widget;
-using Bit.App;
+using Bit.Core;
-using Bit.App.Abstractions;
+using Bit.Core.Abstractions;
-using Bit.App.Enums;
+using Bit.Core.Enums;
+using Bit.Core.Utilities;
 using System.Collections.Generic;
 using System.Linq;
-using XLabs.Ioc;
 
-namespace Bit.Android.Autofill
+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 : global::Android.Service.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)
+        public async override void OnFillRequest(FillRequest request, CancellationSignal cancellationSignal,
+            FillCallback callback)
         {
             var structure = request.FillContexts?.LastOrDefault()?.Structure;
             if(structure == null)
@@ -31,38 +33,42 @@ namespace Bit.Android.Autofill
                 return;
             }
 
-            var parser = new Parser(structure);
+            var parser = new Parser(structure, ApplicationContext);
             parser.Parse();
 
-            if(string.IsNullOrWhiteSpace(parser.Uri) || parser.Uri == "androidapp://com.x8bit.bitwarden" ||
+            if(_storageService == null)
-                parser.Uri == "androidapp://android" || !parser.FieldCollection.Fillable)
+            {
+                _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            }
+
+            var shouldAutofill = await parser.ShouldAutofillAsync(_storageService);
+            if(!shouldAutofill)
             {
                 return;
             }
 
             if(_lockService == null)
             {
-                _lockService = Resolver.Resolve<ILockService>();
+                _lockService = ServiceContainer.Resolve<ILockService>("lockService");
             }
 
             List<FilledItem> items = null;
-            var locked = (await _lockService.GetLockTypeAsync(false)) != LockType.None;
+            var locked = await _lockService.IsLockedAsync();
             if(!locked)
             {
                 if(_cipherService == null)
                 {
-                    _cipherService = Resolver.Resolve<ICipherService>();
+                    _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
                 }
-
                 items = await AutofillHelpers.GetFillItemsAsync(parser, _cipherService);
             }
 
             // build response
-            var response = AutofillHelpers.BuildFillResponse(this, parser, items, locked);
+            var response = AutofillHelpers.BuildFillResponse(parser, items, locked);
             callback.OnSuccess(response);
         }
 
-        public override void OnSaveRequest(SaveRequest request, SaveCallback callback)
+        public async override void OnSaveRequest(SaveRequest request, SaveCallback callback)
         {
             var structure = request.FillContexts?.LastOrDefault()?.Structure;
             if(structure == null)
@@ -70,7 +76,18 @@ namespace Bit.Android.Autofill
                 return;
             }
 
-            var parser = new Parser(structure);
+            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();

src/Android/Autofill/Field.cs

@@ -7,7 +7,7 @@ using static Android.App.Assist.AssistStructure;
 using Android.Text;
 using static Android.Views.ViewStructure;
 
-namespace Bit.Android.Autofill
+namespace Bit.Droid.Autofill
 {
     public class Field
     {
@@ -86,6 +86,69 @@ namespace Bit.Android.Autofill
         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;
@@ -128,72 +191,5 @@ namespace Bit.Android.Autofill
                 }
             }
         }
-
-        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;
-            }
-        }
     }
 }

src/Android/Autofill/FieldCollection.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using Android.Text;
 using Android.Views;
 
-namespace Bit.Android.Autofill
+namespace Bit.Droid.Autofill
 {
     public class FieldCollection
     {
@@ -47,7 +47,6 @@ namespace Bit.Android.Autofill
                 {
                     return _passwordFields;
                 }
-
                 if(Hints.Any())
                 {
                     _passwordFields = new List<Field>();
@@ -64,7 +63,6 @@ namespace Bit.Android.Autofill
                         _passwordFields = Fields.Where(f => FieldHasPasswordTerms(f)).ToList();
                     }
                 }
-
                 return _passwordFields;
             }
         }
@@ -77,7 +75,6 @@ namespace Bit.Android.Autofill
                 {
                     return _usernameFields;
                 }
-
                 _usernameFields = new List<Field>();
                 if(Hints.Any())
                 {
@@ -102,20 +99,29 @@ namespace Bit.Android.Autofill
                         }
                     }
                 }
-
                 return _usernameFields;
             }
         }
 
-        public bool FillableForLogin => FocusedHintsContain(
+        public bool FillableForLogin => FocusedHintsContain(new string[] {
-            new string[] { View.AutofillHintUsername, View.AutofillHintEmailAddress, View.AutofillHintPassword }) ||
+            View.AutofillHintUsername,
-            UsernameFields.Any(f => f.Focused) || PasswordFields.Any(f => f.Focused);
+            View.AutofillHintEmailAddress,
-        public bool FillableForCard => FocusedHintsContain(
+            View.AutofillHintPassword
-            new string[] { View.AutofillHintCreditCardNumber, View.AutofillHintCreditCardExpirationMonth,
+        }) || UsernameFields.Any(f => f.Focused) || PasswordFields.Any(f => f.Focused);
-                View.AutofillHintCreditCardExpirationYear, View.AutofillHintCreditCardSecurityCode});
+
-        public bool FillableForIdentity => FocusedHintsContain(
+        public bool FillableForCard => FocusedHintsContain(new string[] {
-            new string[] { View.AutofillHintName, View.AutofillHintPhone, View.AutofillHintPostalAddress,
+            View.AutofillHintCreditCardNumber,
-                View.AutofillHintPostalCode });
+            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;
 
@@ -127,7 +133,6 @@ namespace Bit.Android.Autofill
             }
 
             _passwordFields = _usernameFields = null;
-
             FieldTrackingIds.Add(field.TrackingId);
             Fields.Add(field);
             AutofillIds.Add(field.AutofillId);
@@ -141,12 +146,10 @@ namespace Bit.Android.Autofill
                     {
                         FocusedHints.Add(hint);
                     }
-
                     if(!HintToFieldsMap.ContainsKey(hint))
                     {
                         HintToFieldsMap.Add(hint, new List<Field>());
                     }
-
                     HintToFieldsMap[hint].Add(field);
                 }
             }
@@ -164,7 +167,7 @@ namespace Bit.Android.Autofill
 
                 var savedItem = new SavedItem
                 {
-                    Type = App.Enums.CipherType.Login,
+                    Type = Core.Enums.CipherType.Login,
                     Login = new SavedItem.LoginItem
                     {
                         Password = GetFieldValue(passwordField)
@@ -173,14 +176,13 @@ namespace Bit.Android.Autofill
 
                 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 = App.Enums.CipherType.Card,
+                    Type = Core.Enums.CipherType.Card,
                     Card = new SavedItem.CardItem
                     {
                         Number = GetFieldValue(View.AutofillHintCreditCardNumber),
@@ -190,10 +192,8 @@ namespace Bit.Android.Autofill
                         Code = GetFieldValue(View.AutofillHintCreditCardSecurityCode)
                     }
                 };
-
                 return savedItem;
             }
-
             return null;
         }
 
@@ -224,7 +224,6 @@ namespace Bit.Android.Autofill
                 }
                 return fieldList.Select(f => f.AutofillId).ToArray();
             }
-
             return new AutofillId[0];
         }
 
@@ -238,7 +237,6 @@ namespace Bit.Android.Autofill
             {
                 return HintToFieldsMap[View.AutofillHintCreditCardNumber].Select(f => f.AutofillId).ToArray();
             }
-
             return new AutofillId[0];
         }
 
@@ -260,7 +258,6 @@ namespace Bit.Android.Autofill
                     }
                 }
             }
-
             return null;
         }
 
@@ -270,7 +267,6 @@ namespace Bit.Android.Autofill
             {
                 return null;
             }
-
             if(!string.IsNullOrWhiteSpace(field.TextValue))
             {
                 if(field.AutofillType == AutofillType.List && field.ListValue.HasValue && monthValue)
@@ -294,7 +290,6 @@ namespace Bit.Android.Autofill
             {
                 return field.ToggleValue.Value.ToString();
             }
-
             return null;
         }
 
@@ -304,6 +299,13 @@ namespace Bit.Android.Autofill
                 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))
             {
@@ -333,7 +335,6 @@ namespace Bit.Android.Autofill
             {
                 return false;
             }
-
             var lowerValue = value.ToLowerInvariant();
             return terms.Any(t => lowerValue.Contains(t));
         }

src/Android/Autofill/FilledItem.cs

@@ -1,107 +1,56 @@
-using System;
+using Android.Service.Autofill;
-using Android.Service.Autofill;
 using Android.Views.Autofill;
 using System.Linq;
-using Bit.App.Models;
+using Bit.Core.Enums;
-using Bit.App.Enums;
 using Android.Views;
+using Bit.Core.Models.View;
 
-namespace Bit.Android.Autofill
+namespace Bit.Droid.Autofill
 {
     public class FilledItem
     {
-        private Lazy<string> _password;
+        private string _password;
-        private Lazy<string> _cardName;
+        private string _cardName;
         private string _cardNumber;
-        private Lazy<string> _cardExpMonth;
+        private string _cardExpMonth;
-        private Lazy<string> _cardExpYear;
+        private string _cardExpYear;
-        private Lazy<string> _cardCode;
+        private string _cardCode;
-        private Lazy<string> _idPhone;
+        private string _idPhone;
-        private Lazy<string> _idEmail;
+        private string _idEmail;
-        private Lazy<string> _idUsername;
+        private string _idUsername;
-        private Lazy<string> _idAddress;
+        private string _idAddress;
-        private Lazy<string> _idPostalCode;
+        private string _idPostalCode;
 
-        public FilledItem(Cipher cipher)
+        public FilledItem(CipherView cipher)
         {
-            Name = cipher.Name?.Decrypt(cipher.OrganizationId) ?? "--";
+            Name = cipher.Name;
             Type = cipher.Type;
+            Subtitle = cipher.SubTitle;
 
             switch(Type)
             {
                 case CipherType.Login:
-                    Subtitle = cipher.Login.Username?.Decrypt(cipher.OrganizationId) ?? string.Empty;
                     Icon = Resource.Drawable.login;
-                    _password = new Lazy<string>(() => cipher.Login.Password?.Decrypt(cipher.OrganizationId));
+                    _password = cipher.Login.Password;
                     break;
                 case CipherType.Card:
-                    Subtitle = cipher.Card.Brand?.Decrypt(cipher.OrganizationId);
+                    _cardNumber = cipher.Card.Number;
-                    _cardNumber = cipher.Card.Number?.Decrypt(cipher.OrganizationId);
-                    if(!string.IsNullOrWhiteSpace(_cardNumber) && _cardNumber.Length >= 4)
-                    {
-                        if(!string.IsNullOrWhiteSpace(_cardNumber))
-                        {
-                            Subtitle += ", ";
-                        }
-                        Subtitle += ("*" + _cardNumber.Substring(_cardNumber.Length - 4));
-                    }
                     Icon = Resource.Drawable.card;
-                    _cardName = new Lazy<string>(() => cipher.Card.CardholderName?.Decrypt(cipher.OrganizationId));
+                    _cardName = cipher.Card.CardholderName;
-                    _cardCode = new Lazy<string>(() => cipher.Card.Code?.Decrypt(cipher.OrganizationId));
+                    _cardCode = cipher.Card.Code;
-                    _cardExpMonth = new Lazy<string>(() => cipher.Card.ExpMonth?.Decrypt(cipher.OrganizationId));
+                    _cardExpMonth = cipher.Card.ExpMonth;
-                    _cardExpYear = new Lazy<string>(() => cipher.Card.ExpYear?.Decrypt(cipher.OrganizationId));
+                    _cardExpYear = cipher.Card.ExpYear;
                     break;
                 case CipherType.Identity:
-                    var firstName = cipher.Identity?.FirstName?.Decrypt(cipher.OrganizationId) ?? " ";
-                    var lastName = cipher.Identity?.LastName?.Decrypt(cipher.OrganizationId) ?? " ";
-                    Subtitle = " ";
-                    if(!string.IsNullOrWhiteSpace(firstName))
-                    {
-                        Subtitle = firstName;
-                    }
-                    if(!string.IsNullOrWhiteSpace(lastName))
-                    {
-                        if(!string.IsNullOrWhiteSpace(Subtitle))
-                        {
-                            Subtitle += " ";
-                        }
-                        Subtitle += lastName;
-                    }
                     Icon = Resource.Drawable.id;
-                    _idPhone = new Lazy<string>(() => cipher.Identity.Phone?.Decrypt(cipher.OrganizationId));
+                    _idPhone = cipher.Identity.Phone;
-                    _idEmail = new Lazy<string>(() => cipher.Identity.Email?.Decrypt(cipher.OrganizationId));
+                    _idEmail = cipher.Identity.Email;
-                    _idUsername = new Lazy<string>(() => cipher.Identity.Username?.Decrypt(cipher.OrganizationId));
+                    _idUsername = cipher.Identity.Username;
-                    _idAddress = new Lazy<string>(() =>
+                    _idAddress = cipher.Identity.FullAddress;
-                    {
+                    _idPostalCode = cipher.Identity.PostalCode;
-                        var address = cipher.Identity.Address1?.Decrypt(cipher.OrganizationId);
-
-                        var address2 = cipher.Identity.Address2?.Decrypt(cipher.OrganizationId);
-                        if(!string.IsNullOrWhiteSpace(address2))
-                        {
-                            if(!string.IsNullOrWhiteSpace(address))
-                            {
-                                address += ", ";
-                            }
-
-                            address += address2;
-                        }
-
-                        var address3 = cipher.Identity.Address3?.Decrypt(cipher.OrganizationId);
-                        if(!string.IsNullOrWhiteSpace(address3))
-                        {
-                            if(!string.IsNullOrWhiteSpace(address))
-                            {
-                                address += ", ";
-                            }
-
-                            address += address3;
-                        }
-
-                        return address;
-                    });
-                    _idPostalCode = new Lazy<string>(() => cipher.Identity.PostalCode?.Decrypt(cipher.OrganizationId));
                     break;
                 default:
+                    Icon = Resource.Drawable.login;
                     break;
             }
         }
@@ -121,11 +70,11 @@ namespace Bit.Android.Autofill
             var setValues = false;
             if(Type == CipherType.Login)
             {
-                if(fieldCollection.PasswordFields.Any() && !string.IsNullOrWhiteSpace(_password.Value))
+                if(fieldCollection.PasswordFields.Any() && !string.IsNullOrWhiteSpace(_password))
                 {
                     foreach(var f in fieldCollection.PasswordFields)
                     {
-                        var val = ApplyValue(f, _password.Value);
+                        var val = ApplyValue(f, _password);
                         if(val != null)
                         {
                             setValues = true;
@@ -133,7 +82,6 @@ namespace Bit.Android.Autofill
                         }
                     }
                 }
-
                 if(fieldCollection.UsernameFields.Any() && !string.IsNullOrWhiteSpace(Subtitle))
                 {
                     foreach(var f in fieldCollection.UsernameFields)
@@ -149,68 +97,73 @@ namespace Bit.Android.Autofill
             }
             else if(Type == CipherType.Card)
             {
-                if(ApplyValue(datasetBuilder, fieldCollection, View.AutofillHintCreditCardNumber,
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintCreditCardNumber,
-                    new Lazy<string>(() => _cardNumber)))
+                    _cardNumber))
                 {
                     setValues = true;
                 }
-                if(ApplyValue(datasetBuilder, fieldCollection, View.AutofillHintCreditCardSecurityCode, _cardCode))
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintCreditCardSecurityCode,
+                    _cardCode))
                 {
                     setValues = true;
                 }
-                if(ApplyValue(datasetBuilder, fieldCollection, View.AutofillHintCreditCardExpirationMonth, _cardExpMonth, true))
+                if(ApplyValue(datasetBuilder, fieldCollection,
+                    Android.Views.View.AutofillHintCreditCardExpirationMonth, _cardExpMonth, true))
                 {
                     setValues = true;
                 }
-                if(ApplyValue(datasetBuilder, fieldCollection, View.AutofillHintCreditCardExpirationYear, _cardExpYear))
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintCreditCardExpirationYear,
+                    _cardExpYear))
                 {
                     setValues = true;
                 }
-                if(ApplyValue(datasetBuilder, fieldCollection, View.AutofillHintName, _cardName))
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintName, _cardName))
                 {
                     setValues = true;
                 }
             }
             else if(Type == CipherType.Identity)
             {
-                if(ApplyValue(datasetBuilder, fieldCollection, View.AutofillHintPhone, _idPhone))
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintPhone, _idPhone))
                 {
                     setValues = true;
                 }
-                if(ApplyValue(datasetBuilder, fieldCollection, View.AutofillHintEmailAddress, _idEmail))
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintEmailAddress, _idEmail))
                 {
                     setValues = true;
                 }
-                if(ApplyValue(datasetBuilder, fieldCollection, View.AutofillHintUsername, _idUsername))
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintUsername,
+                    _idUsername))
                 {
                     setValues = true;
                 }
-                if(ApplyValue(datasetBuilder, fieldCollection, View.AutofillHintPostalAddress, _idAddress))
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintPostalAddress,
+                    _idAddress))
                 {
                     setValues = true;
                 }
-                if(ApplyValue(datasetBuilder, fieldCollection, View.AutofillHintPostalCode, _idPostalCode))
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintPostalCode,
+                    _idPostalCode))
                 {
                     setValues = true;
                 }
-                if(ApplyValue(datasetBuilder, fieldCollection, View.AutofillHintName, new Lazy<string>(() => Subtitle)))
+                if(ApplyValue(datasetBuilder, fieldCollection, Android.Views.View.AutofillHintName, Subtitle))
                 {
                     setValues = true;
                 }
             }
-
             return setValues;
         }
 
         private static bool ApplyValue(Dataset.Builder builder, FieldCollection fieldCollection,
-            string hint, Lazy<string> value, bool monthValue = false)
+            string hint, string value, bool monthValue = false)
         {
             bool setValues = false;
-            if(fieldCollection.HintToFieldsMap.ContainsKey(hint) && !string.IsNullOrWhiteSpace(value.Value))
+            if(fieldCollection.HintToFieldsMap.ContainsKey(hint) && !string.IsNullOrWhiteSpace(value))
             {
                 foreach(var f in fieldCollection.HintToFieldsMap[hint])
                 {
-                    var val = ApplyValue(f, value.Value, monthValue);
+                    var val = ApplyValue(f, value, monthValue);
                     if(val != null)
                     {
                         setValues = true;
@@ -245,7 +198,6 @@ namespace Bit.Android.Autofill
                                 return AutofillValue.ForList(monthIndex - 1);
                             }
                         }
-
                         for(var i = 0; i < field.AutofillOptions.Count; i++)
                         {
                             if(field.AutofillOptions[i].Equals(value))
@@ -266,7 +218,6 @@ namespace Bit.Android.Autofill
                 default:
                     break;
             }
-
             return null;
         }
     }

src/Android/Autofill/Parser.cs

@@ -1,29 +1,33 @@
 using static Android.App.Assist.AssistStructure;
 using Android.App.Assist;
-using Bit.App;
 using System.Collections.Generic;
+using Bit.Core;
+using Android.Content;
+using Bit.Core.Abstractions;
+using System.Threading.Tasks;
 
-namespace Bit.Android.Autofill
+namespace Bit.Droid.Autofill
 {
     public class Parser
     {
-
+        public static HashSet<string> _excludedPackageIds = new HashSet<string>
-        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)
+        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
@@ -32,12 +36,12 @@ namespace Bit.Android.Autofill
                 {
                     return _uri;
                 }
-
+                var webDomainNull = string.IsNullOrWhiteSpace(WebDomain);
-                if(string.IsNullOrWhiteSpace(WebDomain) && string.IsNullOrWhiteSpace(PackageName))
+                if(webDomainNull && string.IsNullOrWhiteSpace(PackageName))
                 {
                     _uri = null;
                 }
-                else if(!string.IsNullOrWhiteSpace(WebDomain))
+                else if(!webDomainNull)
                 {
                     _uri = string.Concat("http://", WebDomain);
                 }
@@ -45,10 +49,10 @@ namespace Bit.Android.Autofill
                 {
                     _uri = string.Concat(Constants.AndroidAppProtocol, PackageName);
                 }
-
                 return _uri;
             }
         }
+
         public string PackageName
         {
             get => _packageName;
@@ -58,10 +62,10 @@ namespace Bit.Android.Autofill
                 {
                     _packageName = _uri = null;
                 }
-
                 _packageName = value;
             }
         }
+
         public string WebDomain
         {
             get => _webDomain;
@@ -71,11 +75,25 @@ namespace Bit.Android.Autofill
                 {
                     _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++)
@@ -83,7 +101,6 @@ namespace Bit.Android.Autofill
                 var node = _structure.GetWindowNodeAt(i);
                 ParseNode(node.RootViewNode);
             }
-
             if(!AutofillHelpers.TrustedBrowsers.Contains(PackageName) &&
                 !AutofillHelpers.CompatBrowsers.Contains(PackageName))
             {
@@ -114,7 +131,7 @@ namespace Bit.Android.Autofill
         private void SetPackageAndDomain(ViewNode node)
         {
             if(string.IsNullOrWhiteSpace(PackageName) && !string.IsNullOrWhiteSpace(node.IdPackage) &&
-                !ExcludedPackageIds.Contains(node.IdPackage))
+                !_excludedPackageIds.Contains(node.IdPackage))
             {
                 PackageName = node.IdPackage;
             }
@@ -124,4 +141,4 @@ namespace Bit.Android.Autofill
             }
         }
     }
-}
+}

src/Android/Autofill/SavedItem.cs

@@ -1,6 +1,6 @@
-using Bit.App.Enums;
+using Bit.Core.Enums;
 
-namespace Bit.Android.Autofill
+namespace Bit.Droid.Autofill
 {
     public class SavedItem
     {

src/Android/AutofillService.cs

@@ -1,544 +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;
-using Bit.App.Abstractions;
-using XLabs.Ioc;
-using Bit.App.Resources;
-
-namespace Bit.Android
-{
-    [Service(Permission = global::Android.Manifest.Permission.BindAccessibilityService, Label = "Bitwarden")]
-    [IntentFilter(new string[] { "android.accessibilityservice.AccessibilityService" })]
-    [MetaData("android.accessibilityservice", Resource = "@xml/accessibilityservice")]
-    public class AutofillService : AccessibilityService
-    {
-        private NotificationChannel _notificationChannel;
-
-        private const string BitwardenTag = "bw_access";
-        private const int AutoFillNotificationId = 34573;
-        private const string SystemUiPackage = "com.android.systemui";
-        private const string BitwardenPackage = "com.x8bit.bitwarden";
-        private const string BitwardenWebsite = "vault.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("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.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[]{' ', '<27>'}).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("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"),
-        }.ToDictionary(n => n.PackageName);
-
-        // Known packages to skip
-        private 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"
-        };
-
-        private readonly IAppSettingsService _appSettings;
-        private long _lastNotificationTime = 0;
-        private string _lastNotificationUri = null;
-        private HashSet<string> _launcherPackageNames = null;
-        private DateTime? _lastLauncherSetBuilt = null;
-        private TimeSpan _rebuildLauncherSpan = TimeSpan.FromHours(1);
-
-        public AutofillService()
-        {
-            _appSettings = Resolver.Resolve<IAppSettingsService>();
-        }
-
-        public override void OnAccessibilityEvent(AccessibilityEvent e)
-        {
-            try
-            {
-                var powerManager = (PowerManager)GetSystemService(PowerService);
-                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;
-                }
-
-                //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 });
-
-                var notificationManager = (NotificationManager)GetSystemService(NotificationService);
-                var cancelNotification = true;
-
-                switch(e.EventType)
-                {
-                    case EventTypes.ViewFocused:
-                        if(e.Source == null || !e.Source.Password || !_appSettings.AutofillPasswordField)
-                        {
-                            break;
-                        }
-
-                        if(e.PackageName == BitwardenPackage)
-                        {
-                            CancelNotification(notificationManager);
-                            break;
-                        }
-
-                        if(ScanAndAutofill(root, e, notificationManager, cancelNotification))
-                        {
-                            CancelNotification(notificationManager);
-                        }
-                        break;
-                    case EventTypes.WindowContentChanged:
-                    case EventTypes.WindowStateChanged:
-                        if(_appSettings.AutofillPasswordField && e.Source.Password)
-                        {
-                            break;
-                        }
-                        else if(_appSettings.AutofillPasswordField && AutofillActivity.LastCredentials == null)
-                        {
-                            if(string.IsNullOrWhiteSpace(_lastNotificationUri))
-                            {
-                                CancelNotification(notificationManager);
-                                break;
-                            }
-
-                            var uri = GetUri(root);
-                            if(uri != _lastNotificationUri)
-                            {
-                                CancelNotification(notificationManager);
-                            }
-                            else if(uri.StartsWith(App.Constants.AndroidAppProtocol))
-                            {
-                                CancelNotification(notificationManager, 30000);
-                            }
-
-                            break;
-                        }
-
-                        if(e.PackageName == BitwardenPackage)
-                        {
-                            CancelNotification(notificationManager);
-                            break;
-                        }
-
-                        if(_appSettings.AutofillPersistNotification)
-                        {
-                            var uri = GetUri(root);
-                            if(uri != null && !uri.Contains(BitwardenWebsite))
-                            {
-                                var needToFill = NeedToAutofill(AutofillActivity.LastCredentials, uri);
-                                if(needToFill)
-                                {
-                                    var passwordNodes = GetWindowNodes(root, e, n => n.Password, false);
-                                    needToFill = passwordNodes.Any();
-                                    if(needToFill)
-                                    {
-                                        var allEditTexts = GetWindowNodes(root, e, n => EditText(n), false);
-                                        var usernameEditText = allEditTexts.TakeWhile(n => !n.Password).LastOrDefault();
-                                        FillCredentials(usernameEditText, passwordNodes);
-
-                                        allEditTexts.Dispose();
-                                        usernameEditText.Dispose();
-                                    }
-                                    passwordNodes.Dispose();
-                                }
-
-                                if(!needToFill)
-                                {
-                                    NotifyToAutofill(uri, notificationManager);
-                                    cancelNotification = false;
-                                }
-                            }
-
-                            AutofillActivity.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()
-        {
-
-        }
-
-        public bool ScanAndAutofill(AccessibilityNodeInfo root, AccessibilityEvent e,
-            NotificationManager notificationManager, bool cancelNotification)
-        {
-            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();
-                        usernameEditText.Dispose();
-                    }
-                    else
-                    {
-                        NotifyToAutofill(uri, notificationManager);
-                        cancelNotification = false;
-                    }
-                }
-
-                AutofillActivity.LastCredentials = null;
-            }
-            else if(AutofillActivity.LastCredentials != null)
-            {
-                System.Threading.Tasks.Task.Run(async () =>
-                {
-                    await System.Threading.Tasks.Task.Delay(1000);
-                    AutofillActivity.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 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();
-                }
-            }
-
-            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?.Contains("EditText") ?? false;
-        }
-
-        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(AutofillActivity));
-            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.notification_sm)
-                   .SetContentTitle(AppResources.BitwardenAutofillService)
-                   .SetContentText(notificationContent)
-                   .SetTicker(notificationContent)
-                   .SetWhen(now)
-                   .SetContentIntent(pendingIntent);
-
-            if(Build.VERSION.SdkInt > BuildVersionCodes.KitkatWatch)
-            {
-                builder.SetVisibility(NotificationVisibility.Secret)
-                    .SetColor(global::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 && */_appSettings.AutofillPersistNotification)
-            {
-                builder.SetPriority(-2);
-            }
-
-            _lastNotificationTime = now;
-            _lastNotificationUri = uri;
-            notificationManager.Notify(AutoFillNotificationId, builder.Build());
-
-            builder.Dispose();
-        }
-
-        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,
-            int recursionDepth = 0)
-        {
-            if(nodes == null)
-            {
-                nodes = new NodeList();
-            }
-
-            var dispose = disposeIfUnused;
-            if(n != null && recursionDepth < 50)
-            {
-                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++)
-                {
-                    var childNode = n.GetChild(i);
-                    if(i > 100)
-                    {
-                        global::Android.Util.Log.Info(BitwardenTag, "Too many child iterations.");
-                        break;
-                    }
-                    else if(childNode.GetHashCode() == n.GetHashCode())
-                    {
-                        global::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;
-        }
-
-        private bool SkipPackage(string eventPackageName)
-        {
-            if(string.IsNullOrWhiteSpace(eventPackageName) || 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);
-        }
-
-        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,35 +0,0 @@
-using System;
-using System.ComponentModel;
-using Android.Content;
-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
-    {
-        public CustomButtonRenderer(Context context)
-            : base(context)
-        { }
-
-        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));
-            }
-
-            // This will prevent all screen overlay apps from being able to interact with buttons.
-            // Ex: apps that change the screen color for "night mode"
-            // Control.FilterTouchesWhenObscured = true;
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            base.OnElementPropertyChanged(sender, e);
-        }
-    }
-}

src/Android/Controls/CustomLabelRenderer.cs

@@ -1,21 +0,0 @@
-using Android.Content;
-using Bit.Android.Controls;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(Label), typeof(CustomLabelRenderer))]
-namespace Bit.Android.Controls
-{
-    public class CustomLabelRenderer : LabelRenderer
-    {
-        public CustomLabelRenderer(Context context)
-            : base(context)
-        { }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Label> e)
-        {
-            base.OnElementChanged(e);
-            Control.SetMaxLines(int.MaxValue);
-        }
-    }
-}

src/Android/Controls/CustomSearchBarRenderer.cs

@@ -1,23 +0,0 @@
-using System;
-using System.ComponentModel;
-using Android.Content;
-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
-    {
-        public CustomSearchBarRenderer(Context context)
-            : base(context)
-        { }
-
-        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/CustomSliderRenderer.cs

@@ -1,27 +0,0 @@
-using System;
-using Bit.Android.Controls;
-using Xamarin.Forms;
-using Android.Content;
-using Xamarin.Forms.Platform.Android;
-using Android.Support.V4.Content.Res;
-
-[assembly: ExportRenderer(typeof(Slider), typeof(CustomSliderRenderer))]
-namespace Bit.Android.Controls
-{
-    public class CustomSliderRenderer : SliderRenderer
-    {
-        public CustomSliderRenderer(Context context)
-            : base(context)
-        { }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Slider> e)
-        {
-            base.OnElementChanged(e);
-            if(Control != null)
-            {
-                var thumb = ResourcesCompat.GetDrawable(Resources, Resource.Drawable.slider_thumb, null);
-                Control.SetThumb(thumb);
-            }
-        }
-    }
-}

src/Android/Controls/ExtendedButtonRenderer.cs

@@ -1,67 +0,0 @@
-using System;
-using System.ComponentModel;
-using Android.Content;
-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
-    {
-        public ExtendedButtonRenderer(Context context)
-            : base(context)
-        { }
-
-        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,86 +0,0 @@
-using System;
-using System.ComponentModel;
-using Bit.Android.Controls;
-using Bit.App.Controls;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-using Android.Text.Method;
-using Android.Views;
-using Android.Content;
-
-[assembly: ExportRenderer(typeof(ExtendedEditor), typeof(ExtendedEditorRenderer))]
-namespace Bit.Android.Controls
-{
-    public class ExtendedEditorRenderer : EditorRenderer
-    {
-        public ExtendedEditorRenderer(Context context)
-            : base(context)
-        { }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Editor> e)
-        {
-            base.OnElementChanged(e);
-
-            var view = (ExtendedEditor)Element;
-
-            SetBorder(view);
-            SetScrollable();
-        }
-
-        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);
-            }
-        }
-
-        private void SetScrollable()
-        {
-            // While scrolling inside Editor stop scrolling parent view.
-            Control.OverScrollMode = OverScrollMode.Always;
-            Control.ScrollBarStyle = ScrollbarStyles.InsideInset;
-            Control.SetOnTouchListener(new EditorTouchListener());
-
-            // For Scrolling in Editor innner area
-            Control.VerticalScrollBarEnabled = true;
-            Control.ScrollBarStyle = ScrollbarStyles.InsideInset;
-
-            // Force scrollbars to be displayed
-            var arr = Control.Context.Theme.ObtainStyledAttributes(new int[0]);
-            InitializeScrollbars(arr);
-            arr.Recycle();
-        }
-
-        public class EditorTouchListener : Java.Lang.Object, IOnTouchListener
-        {
-            public bool OnTouch(global::Android.Views.View v, MotionEvent e)
-            {
-                v.Parent?.RequestDisallowInterceptTouchEvent(true);
-                if((e.Action & MotionEventActions.Up) != 0 && (e.ActionMasked & MotionEventActions.Up) != 0)
-                {
-                    v.Parent?.RequestDisallowInterceptTouchEvent(false);
-                }
-                return false;
-            }
-        }
-    }
-}

src/Android/Controls/ExtendedEntryRenderer.cs

@@ -1,212 +0,0 @@
-using System;
-using System.ComponentModel;
-using Android.Content;
-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 Plugin.CurrentActivity;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(ExtendedEntry), typeof(ExtendedEntryRenderer))]
-namespace Bit.Android.Controls
-{
-    public class ExtendedEntryRenderer : EntryRenderer
-    {
-        public ExtendedEntryRenderer(Context context)
-            : base(context)
-        { }
-
-        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);
-            }
-
-            if(_view.IsPassword)
-            {
-                Control.SetRawInputType(InputTypes.TextFlagNoSuggestions | InputTypes.TextVariationVisiblePassword);
-            }
-
-            _view.ToggleIsPassword += ToggleIsPassword;
-
-            if(_view.FontFamily == "monospace")
-            {
-                Control.Typeface = Typeface.Monospace;
-            }
-
-            if(_view.HideCursor)
-            {
-                Control.SetCursorVisible(false);
-            }
-        }
-
-        private void ToggleIsPassword(object sender, EventArgs e)
-        {
-            var cursorStart = Control.SelectionStart;
-            var cursorEnd = Control.SelectionEnd;
-
-            Control.TransformationMethod = _isPassword ? null : new PasswordTransformationMethod();
-            Control.SetRawInputType(InputTypes.TextFlagNoSuggestions | InputTypes.TextVariationVisiblePassword);
-
-            // 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 imm = CrossCurrentActivity.Current.Activity.GetSystemService(Context.InputMethodService) as InputMethodManager;
-            imm.ShowSoftInput(Control, ShowFlags.Forced);
-            imm.ToggleSoftInput(ShowFlags.Forced, HideSoftInputFlags.ImplicitOnly);
-
-            _isPassword = _view.IsPasswordFromToggled = !_isPassword;
-            _toggledPassword = true;
-        }
-
-        private void Control_EditorAction(object sender, TextView.EditorActionEventArgs e)
-        {
-            if(_view.TargetReturnType != Bit.App.Enums.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.TargetReturnType.HasValue)
-            {
-                switch(view.TargetReturnType.Value)
-                {
-                    case App.Enums.ReturnType.Go:
-                        Control.ImeOptions = ImeAction.Go;
-                        Control.SetImeActionLabel("Go", ImeAction.Go);
-                        break;
-                    case App.Enums.ReturnType.Next:
-                        Control.ImeOptions = ImeAction.Next;
-                        Control.SetImeActionLabel("Next", ImeAction.Next);
-                        break;
-                    case App.Enums.ReturnType.Search:
-                        Control.ImeOptions = ImeAction.Search;
-                        Control.SetImeActionLabel("Search", ImeAction.Search);
-                        break;
-                    case App.Enums.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.TargetMaxLength) });
-        }
-    }
-}

src/Android/Controls/ExtendedPickerRenderer.cs

@@ -1,54 +0,0 @@
-using System;
-using System.ComponentModel;
-using Android.Content;
-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
-    {
-        public ExtendedPickerRenderer(Context context)
-            : base(context)
-        { }
-
-        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,441 +0,0 @@
-using System;
-using Bit.Android.Controls;
-using Bit.App.Controls;
-using Xamarin.Forms;
-using Com.Ittianyu.Bottomnavigationviewex;
-using Xamarin.Forms.Platform.Android;
-using RelativeLayout = Android.Widget.RelativeLayout;
-using Platform = Xamarin.Forms.Platform.Android.Platform;
-using Android.Content;
-using Android.Views;
-using Android.Widget;
-using Android.Support.Design.Internal;
-using System.IO;
-using System.Linq;
-using System.ComponentModel;
-using Android.Support.Design.Widget;
-
-[assembly: ExportRenderer(typeof(ExtendedTabbedPage), typeof(ExtendedTabbedPageRenderer))]
-namespace Bit.Android.Controls
-{
-    public class ExtendedTabbedPageRenderer : VisualElementRenderer<ExtendedTabbedPage>,
-        BottomNavigationView.IOnNavigationItemSelectedListener
-    {
-        public static bool ShouldUpdateSelectedIcon;
-        public static Action<IMenuItem, FileImageSource, bool> MenuItemIconSetter;
-        public static float? BottomBarHeight = 50;
-
-        private RelativeLayout _rootLayout;
-        private FrameLayout _pageContainer;
-        private BottomNavigationViewEx _bottomNav;
-        private readonly int _barId;
-
-        public static global::Android.Graphics.Color? BackgroundColor;
-
-        public ExtendedTabbedPageRenderer(Context context)
-            : base(context)
-        {
-            AutoPackage = false;
-            _barId = GenerateViewId();
-        }
-
-        IPageController TabbedController => Element as IPageController;
-        public int LastSelectedIndex { get; internal set; }
-
-        public bool OnNavigationItemSelected(IMenuItem item)
-        {
-            this.SwitchPage(item);
-            return true;
-        }
-
-        internal void SetupTabItems()
-        {
-            this.SetupTabItems(_bottomNav);
-        }
-
-        internal void SetupBottomBar()
-        {
-            _bottomNav = this.SetupBottomBar(_rootLayout, _bottomNav, _barId);
-        }
-
-        public static readonly Action<IMenuItem, FileImageSource, bool> DefaultMenuItemIconSetter = (menuItem, icon, selected) =>
-        {
-            var tabIconId = ResourceUtils.IdFromTitle(icon, ResourceManager.DrawableClass);
-            menuItem.SetIcon(tabIconId);
-        };
-
-        protected override void OnElementChanged(ElementChangedEventArgs<ExtendedTabbedPage> e)
-        {
-            base.OnElementChanged(e);
-
-            if(e.OldElement != null)
-            {
-                e.OldElement.ChildAdded -= PagesChanged;
-                e.OldElement.ChildRemoved -= PagesChanged;
-                e.OldElement.ChildrenReordered -= PagesChanged;
-            }
-
-            if(e.NewElement == null)
-            {
-                return;
-            }
-
-            UpdateIgnoreContainerAreas();
-
-            if(_rootLayout == null)
-            {
-                SetupNativeView();
-            }
-
-            this.HandlePagesChanged();
-            SwitchContent(Element.CurrentPage);
-
-            Element.ChildAdded += PagesChanged;
-            Element.ChildRemoved += PagesChanged;
-            Element.ChildrenReordered += PagesChanged;
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            base.OnElementPropertyChanged(sender, e);
-            if(e.PropertyName == nameof(TabbedPage.CurrentPage))
-            {
-                SwitchContent(Element.CurrentPage);
-            }
-        }
-
-        void PagesChanged(object sender, EventArgs e)
-        {
-            this.HandlePagesChanged();
-        }
-
-        protected override void OnAttachedToWindow()
-        {
-            base.OnAttachedToWindow();
-            TabbedController?.SendAppearing();
-        }
-
-        protected override void OnDetachedFromWindow()
-        {
-            base.OnDetachedFromWindow();
-            TabbedController?.SendDisappearing();
-        }
-
-        protected override void OnLayout(bool changed, int left, int top, int right, int bottom)
-        {
-            var width = right - left;
-            var height = bottom - top;
-
-            base.OnLayout(changed, left, top, right, bottom);
-            if(width <= 0 || height <= 0)
-            {
-                return;
-            }
-
-            this.Layout(width, height);
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if(disposing)
-            {
-                Element.ChildAdded -= PagesChanged;
-                Element.ChildRemoved -= PagesChanged;
-                Element.ChildrenReordered -= PagesChanged;
-
-                if(_rootLayout != null)
-                {
-                    RemoveAllViews();
-                    foreach(Page pageToRemove in Element.Children)
-                    {
-                        var pageRenderer = Platform.GetRenderer(pageToRemove);
-                        if(pageRenderer != null)
-                        {
-                            pageRenderer.View.RemoveFromParent();
-                            pageRenderer.Dispose();
-                        }
-                    }
-
-                    if(_bottomNav != null)
-                    {
-                        _bottomNav.SetOnNavigationItemSelectedListener(null);
-                        _bottomNav.Dispose();
-                        _bottomNav = null;
-                    }
-                    _rootLayout.Dispose();
-                    _rootLayout = null;
-                }
-            }
-
-            base.Dispose(disposing);
-        }
-
-        internal void SetupNativeView()
-        {
-            _rootLayout = this.CreateRoot(_barId, GenerateViewId(), out _pageContainer);
-            AddView(_rootLayout);
-        }
-
-        void SwitchContent(Page page)
-        {
-            this.ChangePage(_pageContainer, page);
-        }
-
-        void UpdateIgnoreContainerAreas()
-        {
-            foreach(var child in Element.Children)
-            {
-                child.IgnoresContainerArea = false;
-            }
-        }
-    }
-
-    internal static class TabExtensions
-    {
-        public static Rectangle CreateRect(this Context context, int width, int height)
-        {
-            return new Rectangle(0, 0, context.FromPixels(width), context.FromPixels(height));
-        }
-
-        public static void HandlePagesChanged(this ExtendedTabbedPageRenderer renderer)
-        {
-            renderer.SetupBottomBar();
-            renderer.SetupTabItems();
-
-            if(renderer.Element.Children.Count == 0)
-            {
-                return;
-            }
-
-            EnsureTabIndex(renderer);
-        }
-
-        static void EnsureTabIndex(ExtendedTabbedPageRenderer renderer)
-        {
-            var rootLayout = (RelativeLayout)renderer.GetChildAt(0);
-            var bottomNav = (BottomNavigationViewEx)rootLayout.GetChildAt(1);
-            var menu = (BottomNavigationMenu)bottomNav.Menu;
-
-            var itemIndex = menu.FindItemIndex(bottomNav.SelectedItemId);
-            var pageIndex = renderer.Element.Children.IndexOf(renderer.Element.CurrentPage);
-            if(pageIndex >= 0 && pageIndex != itemIndex && pageIndex < bottomNav.ItemCount)
-            {
-                var menuItem = menu.GetItem(pageIndex);
-                bottomNav.SelectedItemId = menuItem.ItemId;
-
-                if(ExtendedTabbedPageRenderer.ShouldUpdateSelectedIcon && ExtendedTabbedPageRenderer.MenuItemIconSetter != null)
-                {
-                    ExtendedTabbedPageRenderer.MenuItemIconSetter?.Invoke(menuItem, renderer.Element.CurrentPage.Icon, true);
-
-                    if(renderer.LastSelectedIndex != pageIndex)
-                    {
-                        var lastSelectedPage = renderer.Element.Children[renderer.LastSelectedIndex];
-                        var lastSelectedMenuItem = menu.GetItem(renderer.LastSelectedIndex);
-                        ExtendedTabbedPageRenderer.MenuItemIconSetter?.Invoke(lastSelectedMenuItem, lastSelectedPage.Icon, false);
-                        renderer.LastSelectedIndex = pageIndex;
-                    }
-                }
-            }
-        }
-
-        public static void SwitchPage(this ExtendedTabbedPageRenderer renderer, IMenuItem item)
-        {
-            var rootLayout = (RelativeLayout)renderer.GetChildAt(0);
-            var bottomNav = (BottomNavigationViewEx)rootLayout.GetChildAt(1);
-            var menu = (BottomNavigationMenu)bottomNav.Menu;
-
-            var index = menu.FindItemIndex(item.ItemId);
-            var pageIndex = index % renderer.Element.Children.Count;
-            var currentPageIndex = renderer.Element.Children.IndexOf(renderer.Element.CurrentPage);
-
-            if(currentPageIndex != pageIndex)
-            {
-                renderer.Element.CurrentPage = renderer.Element.Children[pageIndex];
-            }
-        }
-
-        public static void Layout(this ExtendedTabbedPageRenderer renderer, int width, int height)
-        {
-            var rootLayout = (RelativeLayout)renderer.GetChildAt(0);
-            var bottomNav = (BottomNavigationViewEx)rootLayout.GetChildAt(1);
-
-            var Context = renderer.Context;
-
-            rootLayout.Measure(MakeMeasureSpec(width, MeasureSpecMode.Exactly),
-                MakeMeasureSpec(height, MeasureSpecMode.AtMost));
-
-            ((IPageController)renderer.Element).ContainerArea =
-                Context.CreateRect(rootLayout.MeasuredWidth, rootLayout.GetChildAt(0).MeasuredHeight);
-
-            rootLayout.Measure(MakeMeasureSpec(width, MeasureSpecMode.Exactly),
-                MakeMeasureSpec(height, MeasureSpecMode.Exactly));
-            rootLayout.Layout(0, 0, rootLayout.MeasuredWidth, rootLayout.MeasuredHeight);
-
-            if(renderer.Element.Children.Count == 0)
-            {
-                return;
-            }
-
-            int tabsHeight = bottomNav.MeasuredHeight;
-
-            var item = (ViewGroup)bottomNav.GetChildAt(0);
-            item.Measure(MakeMeasureSpec(width, MeasureSpecMode.Exactly),
-                MakeMeasureSpec(tabsHeight, MeasureSpecMode.Exactly));
-
-            item.Layout(0, 0, width, tabsHeight);
-            int item_w = width / item.ChildCount;
-            for(int i = 0; i < item.ChildCount; i++)
-            {
-                var frame = (FrameLayout)item.GetChildAt(i);
-                frame.Measure(MakeMeasureSpec(item_w, MeasureSpecMode.Exactly),
-                    MakeMeasureSpec(tabsHeight, MeasureSpecMode.Exactly));
-                frame.Layout(i * item_w, 0, i * item_w + item_w, tabsHeight);
-            }
-        }
-
-        public static void SetupTabItems(this ExtendedTabbedPageRenderer renderer, BottomNavigationViewEx bottomNav)
-        {
-            var element = renderer.Element;
-            var menu = (BottomNavigationMenu)bottomNav.Menu;
-            menu.ClearAll();
-
-            var tabsCount = Math.Min(element.Children.Count, bottomNav.MaxItemCount);
-            for(int i = 0; i < tabsCount; i++)
-            {
-                var page = element.Children[i];
-                var menuItem = menu.Add(0, i, 0, page.Title);
-                var setter = ExtendedTabbedPageRenderer.MenuItemIconSetter ?? ExtendedTabbedPageRenderer.DefaultMenuItemIconSetter;
-                setter.Invoke(menuItem, page.Icon, renderer.LastSelectedIndex == i);
-            }
-
-            if(element.Children.Count > 0)
-            {
-                bottomNav.EnableShiftingMode(false);
-                bottomNav.EnableItemShiftingMode(false);
-                bottomNav.EnableAnimation(false);
-                bottomNav.SetTextVisibility(false);
-                bottomNav.SetBackgroundResource(Resource.Drawable.bottom_nav_bg);
-                bottomNav.SetIconSize(24, 24);
-                bottomNav.SetIconsMarginTop(32);
-
-                if(element.Children.Count > 3)
-                {
-                    bottomNav.SetIconSizeAt(3, 29, 29);
-                    bottomNav.SetIconMarginTop(3, 28);
-                }
-
-                var stateList = new global::Android.Content.Res.ColorStateList(
-                    new int[][] {
-                        new int[] { global::Android.Resource.Attribute.StateChecked },
-                        new int[] { global::Android.Resource.Attribute.StateEnabled}
-                    },
-                    new int[] {
-                        element.TintColor.ToAndroid(), // Selected
-                        Color.FromHex("A1A1A1").ToAndroid() // Normal
-                    });
-
-                bottomNav.ItemIconTintList = stateList;
-            }
-        }
-
-        public static BottomNavigationViewEx SetupBottomBar(this ExtendedTabbedPageRenderer renderer,
-            global::Android.Widget.RelativeLayout rootLayout, BottomNavigationViewEx bottomNav, int barId)
-        {
-            if(bottomNav != null)
-            {
-                rootLayout.RemoveView(bottomNav);
-                bottomNav.SetOnNavigationItemSelectedListener(null);
-            }
-
-            var barParams = new global::Android.Widget.RelativeLayout.LayoutParams(
-                ViewGroup.LayoutParams.MatchParent,
-                ExtendedTabbedPageRenderer.BottomBarHeight.HasValue ?
-                (int)rootLayout.Context.ToPixels(ExtendedTabbedPageRenderer.BottomBarHeight.Value) :
-                ViewGroup.LayoutParams.WrapContent);
-            barParams.AddRule(LayoutRules.AlignParentBottom);
-            bottomNav = new BottomNavigationViewEx(rootLayout.Context)
-            {
-                LayoutParameters = barParams,
-                Id = barId
-            };
-            if(ExtendedTabbedPageRenderer.BackgroundColor.HasValue)
-            {
-                bottomNav.SetBackgroundColor(ExtendedTabbedPageRenderer.BackgroundColor.Value);
-            }
-
-            bottomNav.SetOnNavigationItemSelectedListener(renderer);
-            rootLayout.AddView(bottomNav, 1, barParams);
-
-            return bottomNav;
-        }
-
-        public static void ChangePage(this ExtendedTabbedPageRenderer renderer, FrameLayout pageContainer, Page page)
-        {
-            renderer.Context.HideKeyboard(renderer);
-            if(page == null)
-            {
-                return;
-            }
-
-            if(Platform.GetRenderer(page) == null)
-            {
-                Platform.SetRenderer(page, Platform.CreateRendererWithContext(page, renderer.Context));
-            }
-
-            var pageContent = Platform.GetRenderer(page).View;
-            pageContainer.AddView(pageContent);
-            if(pageContainer.ChildCount > 1)
-            {
-                pageContainer.RemoveViewAt(0);
-            }
-
-            EnsureTabIndex(renderer);
-        }
-
-        public static RelativeLayout CreateRoot(this ExtendedTabbedPageRenderer renderer, int barId, int pageContainerId, out FrameLayout pageContainer)
-        {
-            var rootLayout = new RelativeLayout(renderer.Context)
-            {
-                LayoutParameters = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MatchParent, ViewGroup.LayoutParams.MatchParent),
-            };
-
-            var pageParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MatchParent, ViewGroup.LayoutParams.MatchParent);
-            pageParams.AddRule(LayoutRules.Above, barId);
-            pageContainer = new FrameLayout(renderer.Context)
-            {
-                LayoutParameters = pageParams,
-                Id = pageContainerId
-            };
-
-            rootLayout.AddView(pageContainer, 0, pageParams);
-            return rootLayout;
-        }
-
-        private static int MakeMeasureSpec(int size, MeasureSpecMode mode)
-        {
-            return size + (int)mode;
-        }
-    }
-
-    public static class ResourceUtils
-    {
-        public static int IdFromTitle(string title, Type type)
-        {
-            var name = Path.GetFileNameWithoutExtension(title);
-            var id = GetId(type, name);
-            return id;
-        }
-
-        public static int GetId(Type type, string propertyName)
-        {
-            var props = type.GetFields();
-            var prop = props.Select(p => p).FirstOrDefault(p => p.Name == propertyName);
-            if(prop != null)
-            {
-                return (int)prop.GetValue(type);
-            }
-
-            return 0;
-        }
-    }
-}

src/Android/Controls/ExtendedTableViewRenderer.cs

@@ -1,184 +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
-    {
-        public ExtendedTableViewRenderer(Context context)
-            : base(context)
-        { }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<TableView> e)
-        {
-            base.OnElementChanged(e);
-            Control.Divider = null;
-            Control.DividerHeight = 0;
-
-            if(e.NewElement is ExtendedTableView tableView)
-            {
-                if(tableView.BottomPadding > 0)
-                {
-                    Control.SetPadding(0, 0, 0, tableView.BottomPadding);
-                    Control.SetClipToPadding(false);
-                    Control.ScrollBarStyle = ScrollbarStyles.OutsideOverlay;
-                }
-            }
-        }
-
-        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);
-                var cellView = CellFactory.GetCell(cell, convertView, parent, Context, _view);
-                if(layout.ChildCount > 0)
-                {
-                    layout.RemoveViewAt(0);
-                    layout.AddView(cellView, 0);
-                }
-
-                if(cellView.HasFocus)
-                {
-                    cellView.ClearFocus();
-                }
-
-                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/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/FirebaseInstanceIdService.cs

@@ -1,25 +0,0 @@
-#if !FDROID
-using System;
-using Android.App;
-using Android.Content;
-using Bit.App;
-using Bit.App.Abstractions;
-using Firebase.Iid;
-using Plugin.Settings.Abstractions;
-using XLabs.Ioc;
-
-namespace Bit.Android
-{
-    [Service]
-    [IntentFilter(new[] { "com.google.firebase.INSTANCE_ID_EVENT" })]
-    public class FirebaseInstanceIdService : Firebase.Iid.FirebaseInstanceIdService
-    {
-        public override void OnTokenRefresh()
-        {
-            var settings = Resolver.Resolve<ISettings>();
-            settings.AddOrUpdateValue(Constants.PushRegisteredToken, FirebaseInstanceId.Instance.Token);
-            Resolver.Resolve<IPushNotificationService>()?.Register();
-        }
-    }
-}
-#endif

src/Android/MainActivity.cs

@@ -1,200 +1,210 @@
-using System;
+using Android.App;
-using Android.App;
 using Android.Content.PM;
-using Android.Views;
+using Android.Runtime;
 using Android.OS;
-using Bit.App.Abstractions;
+using Bit.Core;
-using XLabs.Ioc;
-using Plugin.Settings.Abstractions;
-using Plugin.Connectivity.Abstractions;
-using Android.Content;
-using System.Reflection;
-using Xamarin.Forms.Platform.Android;
-using Xamarin.Forms;
-using System.Threading.Tasks;
-using Bit.App;
-using Android.Nfc;
-using System.IO;
 using System.Linq;
+using Bit.App.Abstractions;
+using Bit.Core.Utilities;
+using Bit.Core.Abstractions;
+using System.IO;
+using System;
+using Android.Content;
+using Bit.Droid.Utilities;
+using Bit.Droid.Receivers;
 using Bit.App.Models;
-using Bit.App.Enums;
+using Bit.Core.Enums;
+using Android.Nfc;
+using Bit.App.Utilities;
+using System.Threading.Tasks;
 
-namespace Bit.Android
+namespace Bit.Droid
 {
-    [Activity(ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation, Exported = false)]
+    [Activity(
-    public class MainActivity : FormsAppCompatActivity
+        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";
-        private Java.Util.Regex.Pattern _otpPattern = Java.Util.Regex.Pattern.Compile("^.*?([cbdefghijklnrtuv]{32,64})$");
-        private IDeviceActionService _deviceActionService;
-        private IDeviceInfoService _deviceInfoService;
-        private IAppSettingsService _appSettingsService;
-        private ISettings _settings;
-        private AppOptions _appOptions;
 
-        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)
         {
-            if(!Resolver.IsSet)
+            var alarmIntent = new Intent(this, typeof(LockAlarmReceiver));
-            {
+            _lockAlarmPendingIntent = PendingIntent.GetBroadcast(this, 0, alarmIntent,
-                MainApplication.SetIoc(Application);
+                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;
+            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-            TabLayoutResource = Resource.Layout.tabs;
+            _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
+            UpdateTheme(ThemeManager.GetTheme());
-            // ref https://forums.xamarin.com/discussion/62414/app-resuming-results-in-crash-with-formsappcompatactivity
+            base.OnCreate(savedInstanceState);
-            Task.Delay(10).Wait();
+            if(!CoreHelpers.InDebugMode())
-
-            Console.WriteLine("A OnCreate");
-            if(!App.Utilities.Helpers.InDebugMode())
             {
-                Window.AddFlags(WindowManagerFlags.Secure);
+                Window.AddFlags(Android.Views.WindowManagerFlags.Secure);
             }
 
-            var appIdService = Resolver.Resolve<IAppIdService>();
-            var authService = Resolver.Resolve<IAuthService>();
-
 #if !FDROID
-            HockeyApp.Android.CrashManager.Register(this, HockeyAppId,
+            var hockeyAppListener = new HockeyAppCrashManagerListener(_appIdService, _userService);
-                new HockeyAppCrashManagerListener(appIdService, authService));
+            var hockeyAppTask = hockeyAppListener.InitAsync();
+            HockeyApp.Android.CrashManager.Register(this, HockeyAppId, hockeyAppListener);
 #endif
 
-            Forms.Init(this, bundle);
+            Xamarin.Essentials.Platform.Init(this, savedInstanceState);
-
+            Xamarin.Forms.Forms.Init(this, savedInstanceState);
-            typeof(Color).GetProperty("Accent", BindingFlags.Public | BindingFlags.Static)
-                .SetValue(null, Color.FromHex("d2d6de"));
-
-            _deviceActionService = Resolver.Resolve<IDeviceActionService>();
-            _deviceInfoService = Resolver.Resolve<IDeviceInfoService>();
-            _appSettingsService = Resolver.Resolve<IAppSettingsService>();
-            _settings = Resolver.Resolve<ISettings>();
             _appOptions = GetOptions();
-            LoadApplication(new App.App(
+            LoadApplication(new App.App(_appOptions));
-                _appOptions,
-                Resolver.Resolve<IAuthService>(),
-                Resolver.Resolve<IConnectivity>(),
-                Resolver.Resolve<IDatabaseService>(),
-                Resolver.Resolve<ISyncService>(),
-                _settings,
-                Resolver.Resolve<ILockService>(),
-                Resolver.Resolve<ILocalizeService>(),
-                Resolver.Resolve<IAppInfoService>(),
-                _appSettingsService,
-                _deviceActionService));
 
-            if(_appOptions?.Uri == null)
+            _broadcasterService.Subscribe(_activityKey, (message) =>
             {
-                MessagingCenter.Subscribe<Xamarin.Forms.Application, bool>(Xamarin.Forms.Application.Current,
+                if(message.Command == "scheduleLockTimer")
-                    "ListenYubiKeyOTP", (sender, listen) => ListenYubiKey(listen));
+                {
-
+                    var lockOptionMinutes = (int)message.Data;
-                MessagingCenter.Subscribe<Xamarin.Forms.Application>(Xamarin.Forms.Application.Current,
+                    var lockOptionMs = lockOptionMinutes * 60000;
-                    "FinishMainActivity", (sender) => Finish());
+                    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();
             ListenYubiKey(false);
         }
 
-        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();
-        }
-
         protected override void OnResume()
         {
             base.OnResume();
-            Console.WriteLine("A OnResume");
+            if(_deviceActionService.SupportsNfc())
-
-            // workaround for app compat bug
-            // ref https://bugzilla.xamarin.com/show_bug.cgi?id=36907
-            Task.Delay(10).Wait();
-
-            if(_deviceInfoService.NfcEnabled)
             {
                 try
                 {
-                    MessagingCenter.Send(Xamarin.Forms.Application.Current, "ResumeYubiKey");
+                    _messagingService.Send("resumeYubiKey");
                 }
-                catch(Exception e)
+                catch { }
-                {
-                    System.Diagnostics.Debug.WriteLine(e);
-                }
-            }
-
-            if(_appSettingsService.Locked)
-            {
-                MessagingCenter.Send(Xamarin.Forms.Application.Current, "Resumed", false);
             }
         }
 
         protected override void OnNewIntent(Intent intent)
         {
             base.OnNewIntent(intent);
-            Console.WriteLine("A OnNewIntent");
+            if(intent.GetBooleanExtra("generatorTile", false))
-            ParseYubiKey(intent.DataString);
+            {
+                _messagingService.Send("popAllAndGoToTabGenerator");
+                if(_appOptions != null)
+                {
+                    _appOptions.GeneratorTile = true;
+                }
+            }
+            if(intent.GetBooleanExtra("myVaultTile", false))
+            {
+                _messagingService.Send("popAllAndGoToTabMyVault");
+                if(_appOptions != null)
+                {
+                    _appOptions.MyVaultTile = true;
+                }
+            }
+            else
+            {
+                ParseYubiKey(intent.DataString);
+            }
         }
 
-        public async override void OnRequestPermissionsResult(int requestCode, string[] permissions, Permission[] grantResults)
+        public async override void OnRequestPermissionsResult(int requestCode, string[] permissions,
+            [GeneratedEnum] Permission[] grantResults)
         {
             if(requestCode == Constants.SelectFilePermissionRequestCode)
             {
                 if(grantResults.Any(r => r != Permission.Granted))
                 {
-                    MessagingCenter.Send(Xamarin.Forms.Application.Current, "SelectFileCameraPermissionDenied");
+                    _messagingService.Send("selectFileCameraPermissionDenied");
                 }
                 await _deviceActionService.SelectFileAsync();
-                return;
             }
-
+            else
-            ZXing.Net.Mobile.Forms.Android.PermissionsHandler.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+            {
+                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)
             {
-                global::Android.Net.Uri uri = null;
+                Android.Net.Uri uri = null;
                 string fileName = null;
                 if(data != null && data.Data != null)
                 {
                     uri = data.Data;
-                    fileName = Utilities.GetFileName(ApplicationContext, uri);
+                    fileName = AndroidHelpers.GetFileName(ApplicationContext, uri);
                 }
                 else
                 {
                     // camera
-                    var root = new Java.IO.File(global::Android.OS.Environment.ExternalStorageDirectory, "bitwarden");
+                    var root = new Java.IO.File(Android.OS.Environment.ExternalStorageDirectory, "bitwarden");
                     var file = new Java.IO.File(root, "temp_camera_photo.jpg");
-                    uri = global::Android.Net.Uri.FromFile(file);
+                    uri = Android.Net.Uri.FromFile(file);
                     fileName = $"photo_{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.jpg";
                 }
 
@@ -202,37 +212,46 @@ namespace Bit.Android
                 {
                     return;
                 }
-
+                try
-                using(var stream = ContentResolver.OpenInputStream(uri))
-                using(var memoryStream = new MemoryStream())
                 {
-                    stream.CopyTo(memoryStream);
+                    using(var stream = ContentResolver.OpenInputStream(uri))
-                    MessagingCenter.Send(Xamarin.Forms.Application.Current, "SelectFileResult",
+                    using(var memoryStream = new MemoryStream())
-                        new Tuple<byte[], string>(memoryStream.ToArray(), fileName ?? "unknown_file_name"));
+                    {
+                        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(!_deviceInfoService.NfcEnabled)
+            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
@@ -242,22 +261,11 @@ namespace Bit.Android
             }
             else
             {
-                adapter.DisableForegroundDispatch(this);
+                try
-            }
+                {
-        }
+                    adapter.DisableForegroundDispatch(this);
-
+                }
-        private void ParseYubiKey(string data)
+                catch { }
-        {
-            if(data == null)
-            {
-                return;
-            }
-
-            var otpMatch = _otpPattern.Matcher(data);
-            if(otpMatch.Matches())
-            {
-                var otp = otpMatch.Group(1);
-                MessagingCenter.Send(Xamarin.Forms.Application.Current, "GotYubiKeyOTP", otp);
             }
         }
 
@@ -267,15 +275,14 @@ namespace Bit.Android
             {
                 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);
@@ -288,8 +295,82 @@ namespace Bit.Android
                 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,141 +1,66 @@
-using System;
+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 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;
+#if !FDROID
-using XLabs.Ioc;
-using System.Threading.Tasks;
-using XLabs.Ioc.SimpleInjectorContainer;
-using SimpleInjector;
 using Android.Gms.Security;
+#endif
 
-namespace Bit.Android
+namespace Bit.Droid
 {
 #if DEBUG
     [Application(Debuggable = true)]
 #else
     [Application(Debuggable = false)]
 #endif
+    [Register("com.x8bit.bitwarden.MainApplication")]
+#if FDROID
+    public class MainApplication : Application
+#else
     public class MainApplication : Application, ProviderInstaller.IProviderInstallListener
+#endif
     {
         public MainApplication(IntPtr handle, JniHandleOwnership transer)
           : base(handle, transer)
         {
-            //AndroidEnvironment.UnhandledExceptionRaiser += AndroidEnvironment_UnhandledExceptionRaiser;
+            if(ServiceContainer.RegisteredServices.Count == 0)
-
-            if(!Resolver.IsSet)
             {
-                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
-
-        private void AndroidEnvironment_UnhandledExceptionRaiser(object sender, RaiseThrowableEventArgs e)
-        {
-            var message = Utilities.AppendExceptionToMessage("", e.Exception);
-            //Utilities.SaveCrashFile(message, true);
-            Utilities.SendCrashEmail(message, false);
         }
 
         public override void OnCreate()
         {
             base.OnCreate();
-
+            Bootstrap();
-            // workaround for app compat bug
-            // ref https://forums.xamarin.com/discussion/62414/app-resuming-results-in-crash-with-formsappcompatactivity
-            Task.Delay(10).Wait();
             CrossCurrentActivity.Current.Init(this);
         }
 
-        public static void SetIoc(Application application)
-        {
-            Refractored.FabControl.Droid.FloatingActionButtonViewRenderer.Init();
-            FFImageLoading.Forms.Platform.CachedImageRenderer.Init(true);
-            ZXing.Net.Mobile.Forms.Android.Platform.Init();
-            CrossFingerprint.SetCurrentActivityResolver(() => CrossCurrentActivity.Current.Activity);
-
-            //var container = new UnityContainer();
-            var container = new Container();
-
-            // Android Stuff
-            container.RegisterInstance(application.ApplicationContext);
-            container.RegisterInstance<Application>(application);
-
-            // Services
-            container.RegisterSingleton<IDatabaseService, DatabaseService>();
-            container.RegisterSingleton<ISqlService, SqlService>();
-            container.RegisterSingleton<ISecureStorageService, AndroidKeyStoreStorageService>();
-            container.RegisterSingleton<ICryptoService, CryptoService>();
-            container.RegisterSingleton<IKeyDerivationService, BouncyCastleKeyDerivationService>();
-            container.RegisterSingleton<IAuthService, AuthService>();
-            container.RegisterSingleton<IFolderService, FolderService>();
-            container.RegisterSingleton<ICollectionService, CollectionService>();
-            container.RegisterSingleton<ICipherService, CipherService>();
-            container.RegisterSingleton<ISyncService, SyncService>();
-            container.RegisterSingleton<IDeviceActionService, DeviceActionService>();
-            container.RegisterSingleton<IAppIdService, AppIdService>();
-            container.RegisterSingleton<IPasswordGenerationService, PasswordGenerationService>();
-            container.RegisterSingleton<ILockService, LockService>();
-            container.RegisterSingleton<IAppInfoService, AppInfoService>();
-#if FDROID
-            container.RegisterSingleton<IGoogleAnalyticsService, NoopGoogleAnalyticsService>();
-#else
-            container.RegisterSingleton<IGoogleAnalyticsService, GoogleAnalyticsService>();
-#endif
-            container.RegisterSingleton<IDeviceInfoService, DeviceInfoService>();
-            container.RegisterSingleton<ILocalizeService, LocalizeService>();
-            container.RegisterSingleton<ILogService, LogService>();
-            container.RegisterSingleton<IHttpService, HttpService>();
-            container.RegisterSingleton<ITokenService, TokenService>();
-            container.RegisterSingleton<ISettingsService, SettingsService>();
-            container.RegisterSingleton<IAppSettingsService, AppSettingsService>();
-
-            // Repositories
-            container.RegisterSingleton<IFolderRepository, FolderRepository>();
-            container.RegisterSingleton<IFolderApiRepository, FolderApiRepository>();
-            container.RegisterSingleton<ICipherRepository, CipherRepository>();
-            container.RegisterSingleton<IAttachmentRepository, AttachmentRepository>();
-            container.RegisterSingleton<IConnectApiRepository, ConnectApiRepository>();
-            container.RegisterSingleton<IDeviceApiRepository, DeviceApiRepository>();
-            container.RegisterSingleton<IAccountsApiRepository, AccountsApiRepository>();
-            container.RegisterSingleton<ICipherApiRepository, CipherApiRepository>();
-            container.RegisterSingleton<ISettingsRepository, SettingsRepository>();
-            container.RegisterSingleton<ISettingsApiRepository, SettingsApiRepository>();
-            container.RegisterSingleton<ITwoFactorApiRepository, TwoFactorApiRepository>();
-            container.RegisterSingleton<ISyncApiRepository, SyncApiRepository>();
-            container.RegisterSingleton<ICollectionRepository, CollectionRepository>();
-            container.RegisterSingleton<ICipherCollectionRepository, CipherCollectionRepository>();
-
-            // Other
-            container.RegisterInstance(CrossSettings.Current);
-            container.RegisterInstance(CrossConnectivity.Current);
-            container.RegisterInstance(CrossFingerprint.Current);
-
-            // Push
-#if FDROID
-            container.RegisterSingleton<IPushNotificationListener, NoopPushNotificationListener>();
-            container.RegisterSingleton<IPushNotificationService, NoopPushNotificationService>();
-#else
-            container.RegisterSingleton<IPushNotificationListener, PushNotificationListener>();
-            container.RegisterSingleton<IPushNotificationService, AndroidPushNotificationService>();
-#endif
-
-            container.Verify();
-            Resolver.SetResolver(new SimpleInjectorResolver(container));
-        }
-
         public void OnProviderInstallFailed(int errorCode, Intent recoveryIntent)
         {
         }
@@ -143,5 +68,90 @@ namespace Bit.Android
         public void OnProviderInstalled()
         {
         }
+
+        private void RegisterLocalServices()
+        {
+            ServiceContainer.Register<ILogService>("logService", new AndroidLogService());
+            ServiceContainer.Register("settingsShim", new App.Migration.SettingsShim());
+            if(App.Migration.MigrationHelpers.NeedsMigration())
+            {
+                ServiceContainer.Register<App.Migration.Abstractions.IOldSecureStorageService>(
+                    "oldSecureStorageService", new Migration.AndroidKeyStoreStorageService());
+            }
+
+            Refractored.FabControl.Droid.FloatingActionButtonViewRenderer.Init();
+            // Note: This might cause a race condition. Investigate more.
+            Task.Run(() =>
+            {
+                FFImageLoading.Forms.Platform.CachedImageRenderer.Init(true);
+                FFImageLoading.ImageService.Instance.Initialize(new FFImageLoading.Config.Configuration
+                {
+                    FadeAnimationEnabled = false,
+                    FadeAnimationForCachedImages = false
+                });
+                ZXing.Net.Mobile.Forms.Android.Platform.Init();
+            });
+            CrossFingerprint.SetCurrentActivityResolver(() => CrossCurrentActivity.Current.Activity);
+            CrossFingerprint.SetDialogFragmentType<CustomFingerprintDialogFragment>();
+
+            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
+            var notificationListenerService = new PushNotificationListenerService();
+            ServiceContainer.Register<IPushNotificationListenerService>(
+                "pushNotificationListenerService", notificationListenerService);
+            var androidPushNotificationService = new AndroidPushNotificationService(
+                mobileStorageService, notificationListenerService);
+            ServiceContainer.Register<IPushNotificationService>(
+                "pushNotificationService", androidPushNotificationService);
+#endif
+        }
+
+        private void Bootstrap()
+        {
+            (ServiceContainer.Resolve<II18nService>("i18nService") as MobileI18nService).Init();
+            ServiceContainer.Resolve<IAuthService>("authService").Init();
+            // Note: This is not awaited
+            var bootstrapTask = BootstrapAsync();
+        }
+
+        private async Task BootstrapAsync()
+        {
+            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

@@ -8,14 +8,16 @@ using Javax.Security.Auth.X500;
 using Java.Math;
 using Android.Security.Keystore;
 using Android.App;
-using Plugin.Settings.Abstractions;
 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.Android.Services
+namespace Bit.Droid.Migration
 {
-    public class AndroidKeyStoreStorageService : ISecureStorageService
+    public class AndroidKeyStoreStorageService : IOldSecureStorageService
     {
         private const string AndroidKeyStore = "AndroidKeyStore";
         private const string AesMode = "AES/GCM/NoPadding";
@@ -31,19 +33,20 @@ namespace Bit.Android.Services
 
         private readonly string _rsaMode;
         private readonly bool _oldAndroid;
-        private readonly ISettings _settings;
+        private readonly SettingsShim _settings;
         private readonly KeyStore _keyStore;
 
-        public AndroidKeyStoreStorageService(ISettings settings)
+        public AndroidKeyStoreStorageService()
         {
             _oldAndroid = Build.VERSION.SdkInt < BuildVersionCodes.M;
             _rsaMode = _oldAndroid ? "RSA/ECB/PKCS1Padding" : "RSA/ECB/OAEPWithSHA-1AndMGF1Padding";
 
-            _settings = settings;
+            _settings = ServiceContainer.Resolve<SettingsShim>("settingsShim");
 
             _keyStore = KeyStore.GetInstance(AndroidKeyStore);
             _keyStore.Load(null);
 
+            /*
             try
             {
                 GenerateStoreKey(true);
@@ -54,6 +57,7 @@ namespace Bit.Android.Services
             }
 
             GenerateAesKey();
+            */
         }
 
         public bool Contains(string key)
@@ -95,7 +99,7 @@ namespace Bit.Android.Services
 
             try
             {
-                return App.Utilities.Crypto.AesCbcDecrypt(new App.Models.CipherString(cs), aesKey);
+                return App.Migration.Crypto.AesCbcDecrypt(new App.Migration.Models.CipherString(cs), aesKey);
             }
             catch
             {
@@ -125,7 +129,7 @@ namespace Bit.Android.Services
 
             try
             {
-                var cipherString = App.Utilities.Crypto.AesCbcEncrypt(dataBytes, aesKey);
+                var cipherString = App.Migration.Crypto.AesCbcEncrypt(dataBytes, aesKey);
                 _settings.AddOrUpdateValue(formattedKey, cipherString.EncryptedString);
             }
             catch
@@ -197,12 +201,12 @@ namespace Bit.Android.Services
                 return;
             }
 
-            var key = App.Utilities.Crypto.RandomBytes(512 / 8);
+            var key = App.Migration.Crypto.RandomBytes(512 / 8);
             var encKey = _oldAndroid ? RsaEncrypt(key) : AesEncrypt(key);
             _settings.AddOrUpdateValue(AesKey, encKey);
         }
 
-        private App.Models.SymmetricCryptoKey GetAesKey(bool v1 = false)
+        private App.Migration.Models.SymmetricCryptoKey GetAesKey(bool v1 = false)
         {
             try
             {
@@ -222,7 +226,7 @@ namespace Bit.Android.Services
                 {
                     var encKeyBytes = Convert.FromBase64String(encKey);
                     var key = RsaDecrypt(encKeyBytes, v1);
-                    return new App.Models.SymmetricCryptoKey(key);
+                    return new App.Migration.Models.SymmetricCryptoKey(key);
                 }
                 else
                 {
@@ -235,7 +239,7 @@ namespace Bit.Android.Services
                     var ivBytes = Convert.FromBase64String(parts[0]);
                     var encKeyBytes = Convert.FromBase64String(parts[1]);
                     var key = AesDecrypt(ivBytes, encKeyBytes);
-                    return new App.Models.SymmetricCryptoKey(key);
+                    return new App.Migration.Models.SymmetricCryptoKey(key);
                 }
             }
             catch
@@ -317,7 +321,7 @@ namespace Bit.Android.Services
                     try
                     {
                         var cs = _settings.GetValueOrDefault(formattedKeyV1, null);
-                        var value = App.Utilities.Crypto.AesCbcDecrypt(new App.Models.CipherString(cs), aesKeyV1);
+                        var value = App.Migration.Crypto.AesCbcDecrypt(new App.Migration.Models.CipherString(cs), aesKeyV1);
                         Store(key, value);
                         return value;
                     }

src/Android/PackageReplacedReceiver.cs

@@ -1,23 +0,0 @@
-using Android.App;
-using Android.Content;
-using Bit.App.Abstractions;
-using Bit.App.Utilities;
-using Plugin.Settings.Abstractions;
-using System;
-using XLabs.Ioc;
-
-namespace Bit.Android
-{
-    [BroadcastReceiver(Name = "com.x8bit.bitwarden.PackageReplacedReceiver", Exported = false)]
-    [IntentFilter(new[] { Intent.ActionMyPackageReplaced })]
-    public class PackageReplacedReceiver : BroadcastReceiver
-    {
-        public override void OnReceive(Context context, Intent intent)
-        {
-            Console.WriteLine("Bitwarden App Updated!!");
-            Helpers.PerformUpdateTasks(Resolver.Resolve<ISettings>(),
-                Resolver.Resolve<IAppInfoService>(), Resolver.Resolve<IDatabaseService>(),
-                Resolver.Resolve<ISyncService>());
-        }
-    }
-}

src/Android/Properties/AndroidManifest.xml

@@ -1,34 +1,49 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.x8bit.bitwarden" android:versionName="1.21.0" android:installLocation="auto" android:versionCode="502" xmlns:tools="http://schemas.android.com/tools">
+<manifest
-  <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="26" />
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:versionCode="1"
+  android:versionName="2.0.2"
+  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-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/BitwardenTheme" android:allowBackup="false"
+  <application
-               android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round"
+    android:label="Bitwarden"
-               android:networkSecurityConfig="@xml/network_security_config">
+    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:name="android.support.v4.content.FileProvider"
-        android:authorities="com.x8bit.bitwarden.fileprovider"
+      android:authorities="com.x8bit.bitwarden.fileprovider"
-        android:exported="false"
+      android:exported="false"
-        android:grantUriPermissions="true">
+      android:grantUriPermissions="true">
       <meta-data
-          android:name="android.support.FILE_PROVIDER_PATHS"
+        android:name="android.support.FILE_PROVIDER_PATHS"
-          android:resource="@xml/filepaths" />
+        android:resource="@xml/filepaths" />
     </provider>
 
-    <receiver android:name="com.google.firebase.iid.FirebaseInstanceIdInternalReceiver"
+    <receiver
-              android:exported="false" />
+      android:name="com.google.firebase.iid.FirebaseInstanceIdInternalReceiver"
-    <receiver android:name="com.google.firebase.iid.FirebaseInstanceIdReceiver"
+      android:exported="false" />
-              android:exported="true" android:permission="com.google.android.c2dm.permission.SEND">
+    <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" />
@@ -36,7 +51,6 @@
       </intent-filter>
     </receiver>
 
-    <activity android:name="net.hockeyapp.android.UpdateActivity" android:exported="false" />
     <meta-data android:name="android.max_aspect" android:value="2.1" />
   </application>
 </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
@@ -11,7 +9,7 @@ using Android.App;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("8bit Solutions LLC")]
 [assembly: AssemblyProduct("Bitwarden")]
-[assembly: AssemblyCopyright("Copyright © 2016")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]

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

@@ -1,38 +1,36 @@
 #if !FDROID
-using System;
 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;
-using XLabs.Ioc;
 
-namespace Bit.Android
+namespace Bit.Droid.Push
 {
     [Service]
     [IntentFilter(new[] { "com.google.firebase.MESSAGING_EVENT" })]
     public class FirebaseMessagingService : Firebase.Messaging.FirebaseMessagingService
     {
-        public override void OnMessageReceived(RemoteMessage message)
+        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 = Resolver.Resolve<IPushNotificationListener>();
+                var listener = ServiceContainer.Resolve<IPushNotificationListenerService>(
-                listener.OnMessage(obj, Device.Android);
+                    "pushNotificationListenerService");
+                await listener.OnMessageAsync(obj, Device.Android);
             }
             catch(JsonReaderException ex)
             {

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

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

@@ -1,5 +1,4 @@
 using System;
-using Bit.Android.Controls;
 using Bit.App.Controls;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
@@ -7,9 +6,11 @@ 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.Android.Controls
+namespace Bit.Droid.Renderers
 {
     public class HybridWebViewRenderer : ViewRenderer<HybridWebView, AWebkit.WebView>
     {
@@ -34,14 +35,12 @@ namespace Bit.Android.Controls
                 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");
@@ -49,6 +48,15 @@ namespace Bit.Android.Controls
             }
         }
 
+        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;
@@ -62,8 +70,8 @@ namespace Bit.Android.Controls
             [Export("invokeAction")]
             public void InvokeAction(string data)
             {
-                HybridWebViewRenderer hybridRenderer;
+                if(_hybridWebViewRenderer != null &&
-                if(_hybridWebViewRenderer != null && _hybridWebViewRenderer.TryGetTarget(out hybridRenderer))
+                    _hybridWebViewRenderer.TryGetTarget(out HybridWebViewRenderer hybridRenderer))
                 {
                     hybridRenderer.Element.InvokeAction(data);
                 }
@@ -79,6 +87,7 @@ namespace Bit.Android.Controls
                 _javascript = javascript;
 
             }
+
             public override void OnPageFinished(AWebkit.WebView view, string url)
             {
                 base.OnPageFinished(view, url);

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.