Merge upstream 20220901 #80
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Supress lock and logout when showing fileswitcher on Android * convert suppress bool to delay long - move HandleVaultTimeoutAsync to vaultTimeoutService
…ndroid Autofill (#1722) * Check for disable save prompt option before sending fill request - ignore save request payload if true * Add exception handling to Autofill Service * move System reference outside of FDROID
Co-authored-by: github-actions <>
* Changed ProgressDialog because deprecated and improved the dismissal of the dialog in order for it not to crash the app on certain situations * Removed android version check given that our minimum is greater that the check
* WIP Added Verification Code page and a verification flow helper to coordinate things * Improved Verification Code page verification flow helper and fix some issues, also added flag ApiService to choose whether to logout on Unanuthorized * Improved Verification Code page UI/UX verification flow helper and fix some issues and made some cleanups * Fix spelling
* Improved theming logic and performance, also fixed some issues regarding changing the theme after vault timeout and fixed theme applying on password generator/history * Removed messenger from theme update, and now the navigation stack is traversed and each IThemeDirtablePage gets theme updated * Improved code on update theme on pages
* move timepicker to separate DataTemplate - activate timepicker when selecting row * null check on TimePicker
* WIP Add Share app extension on iOS for Send * Added Share app extension on iOS for Send and some code fixes as well * Updated iOS csprojs configs to linkskip the new extension project and also added AdHoc and AppStore configurations to iOS.ShareExtension.csproj * Code clean up and transformed bundle resources into links to the already used pngs of the main iOS project on ShareExtension * Updated build.yml to include provisioning profile for iOS Share extension * Adding in the missing provisioning profile * Removed .DS_Store from the iOS.ShareExtension csproj Resources * switching out the share extension profile * Added Share extension provisioning profile configuration on export options app store for github and also removed custom info.plist config for localhost which is not necessary * Moved property so that it's grouped with the full ones * Added AppCenter Crashes package to Core and updated FireAndForget Task Extension * Updated bundle reference of FontAwesome.ttf to bwi-font.ttf in order for it to compile on ShareExtension Co-authored-by: Joseph Flinn <joseph.s.flinn@gmail.com> Co-authored-by: Álison Fernandes <vvolkgang@users.noreply.github.com>
Co-authored-by: Jacob Fink <jfink@bitwarden.com>
Co-authored-by: github-actions <>
… incorrectly to the server (#1751)
Co-authored-by: github-actions <>
…tion handling #1228 (#1759)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…and task handlilng (#1764)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
bitwarden-mobile.sln got a merge error on App.csproj project's ID VisualStudio applied automatic build configuration generation for Cozy builds VisualStudio applied automatic Visible=false on ImageAssets, this seems to have no impact on build so we chose to favour homogeneity with other ImageAssets
In 2e8824c UserService has been removed in favor of OrganizationService So we want to reapply Cozy custom code from old UserService into the new OrganizationService
In 74e90da ThemeManager has been refactored The code got too many modification so that it was too difficult to reapply them during the previous merge-upstream So we chose to resolve conflicts by taking upstream versions and to reapply Cozy custom code in this commit
In 8ec6545 AddEditPage and ViewPage has been removed in favor of CipherAddEditPage and CipherDetailsPage So we want to reapply Cozy custom code from old AddEditPage and ViewPage into the new CipherAddEditPage and CipherDetailsPage
In 90a6850 AndroidManifest.xml has been reformated The code got too many modification so that it was too difficult to reapply them during the previous merge-upstream So we chose to resolve conflicts by taking upstream versions and to reapply Cozy custom code in this commit Revert "First" This reverts commit cfe358384379d15d48396aea4c52f809a346b75c.
In 05bcc10 Activity and IntentFilter declarations have been moved to AndroidManifest.xml So we want to reapply Cozy custom code from old MainActivity.cs declaration into the new AndroidManifest.xml declaration
Some of those namespaces have been lost during previous merge-upstream, some others are from newly added files by Bitwarden and should be replaced by ours
In 2d2a883 SettingsPageViewModel has been refactored and Cozy custom code was not compatible with new implementation anymore, so we fixed our Custom code to fit it Also some code got too many modifications so that it was too difficult to reapply them during the previous merge-upstream So we chose to resolve conflicts by taking upstream versions and to reapply Cozy custom code in this commit
In 3d388ab we applied a temporary fix to SettingsPage in order to solve a scroll bug on iOS During previous merge-upstream this code should have been removed as new Bitwarden's code already fix it
In 3f1674c Bitwarden moved their icon system from `FontAwesome` in favor of their new homemade `bwi-font` As we used icons from `FontAwesome` in ToggleArrowConverter we have to fix it by using the new BitwardenIcons enum
The HomePage code was too difficult to merge duringthe previous merge-upstream so we chose to resolve conflicts by taking upstream versions and to reapply Cozy custom code in this commit
The LockPage code was too difficult to merge duringthe previous merge-upstream so we chose to resolve conflicts by taking upstream versions and to reapply Cozy custom code in this commit
The LoginPage code was too difficult to merge duringthe previous merge-upstream so we chose to resolve conflicts by taking upstream versions and to reapply Cozy custom code in this commit
In b1fb867 GeneratorPage got a new feature that allows to generate usernames The code got too many modification so that it was too difficult to reapply them during the previous merge-upstream So we chose to resolve conflicts by taking upstream versions and to reapply Cozy custom code in this commit
We do not use AppCenter at Cozy. So we do not want to keep sending those data to MS This commit reapply some of the edits from fc638c3 that were canceled by last merge-upstream containing Bitwarden's refactoring
Bitwarden's Vault mechanism is based on organisations As Organisations were reworded into Folders in Cozy's context since d533b40 then we want to do the same here
Those CI files are not used by Cozy and can impact with in build process We may add them back in the future when we will be ready Related commit: deee2b8
Seems to work on VisualStudio 2022.
Multi Account is a new feature from Bitwarden that we retrieved in previous merge upstream We want to disable it until we analyse if our userbase would use it or if it would be confusing for them
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge upstream of Bitwarden code until bitwarden/mobile@119fc58
The last 24 commits are commits to fix Cozy customizations and builds
TODO: