Upstream/bitwarden-mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile.git synced 2024-10-01 04:27:39 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/maui-migration' of https://github.com/bitwarden/mobile into feature/maui-migration

Browse Source
This commit is contained in:
Federico Maccaroni 2023-10-04 12:45:08 -03:00
commit efb8763d3c
No known key found for this signature in database
GPG Key ID: 5D233F8F2B034536
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bitwarden-mobile.sln
View File

@ -33,7 +33,6 @@ Global
{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|Any CPU.Build.0 = Release|Any CPU
{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|Any CPU.Build.0 = Release|Any CPU
{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|Any CPU.Deploy.0 = Release|Any CPU

12
src/App/Platforms/Android/MainApplication.cs
View File

@ -139,16 +139,8 @@ namespace Bit.Droid
CrossFingerprint.SetCurrentActivityResolver(() => CrossCurrentActivity.Current.Activity);
var preferencesStorage = new PreferencesStorageService(null);
var documentsPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal);
// TODO: [MAUI-Migration] [Critical] HACK in MAUI the Personal folder adds a \Documents at the end that shouldn't be there
var lastPartDocumentsPathIndex = documentsPath.IndexOf("Documents") - 1;
if (lastPartDocumentsPathIndex >= 0)
{
documentsPath = documentsPath.Substring(0, lastPartDocumentsPathIndex);
}
var liteDbStorage = new LiteDbStorageService(Path.Combine(documentsPath, "bitwarden.db"));
var localAppDataFolderPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.LocalApplicationData);
var liteDbStorage = new LiteDbStorageService(Path.Combine(localAppDataFolderPath, "bitwarden.db"));
var localizeService = new LocalizeService();
var broadcasterService = new BroadcasterService(logger);
var messagingService = new MobileBroadcasterMessagingService(broadcasterService);