bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-25 20:53:25 +00:00
Code Issues Releases Wiki Activity

needs migration flag

Browse Source
This commit is contained in:
Kyle Spearrin
2019-05-30 15:11:22 -04:00
parent c7b62c8551
commit 419cfceef1
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Android/MainApplication.cs
View File

@@ -43,6 +43,11 @@ namespace Bit.Droid
private void RegisterLocalServices()
{
var settingsShim = new App.Migration.SettingsShim();
ServiceContainer.Register("settingsShim", settingsShim);
App.Utilities.AppHelpers.NeedsMigration =
settingsShim.GetValueOrDefault(Constants.OldLastActivityKey, DateTime.MinValue) > DateTime.MinValue;
Refractored.FabControl.Droid.FloatingActionButtonViewRenderer.Init();
// Note: This might cause a race condition. Investigate more.
Task.Run(() =>

3
src/Android/Migration/AndroidKeyStoreStorageService.cs
View File

@@ -12,6 +12,7 @@ using Java.Util;
using Javax.Crypto.Spec;
using Android.Preferences;
using Bit.App.Migration;
using Bit.Core.Utilities;
namespace Bit.Droid.Migration
{
@@ -39,7 +40,7 @@ namespace Bit.Droid.Migration
_oldAndroid = Build.VERSION.SdkInt < BuildVersionCodes.M;
_rsaMode = _oldAndroid ? "RSA/ECB/PKCS1Padding" : "RSA/ECB/OAEPWithSHA-1AndMGF1Padding";
_settings = new SettingsShim();
_settings = ServiceContainer.Resolve<SettingsShim>("settingsShim");
_keyStore = KeyStore.GetInstance(AndroidKeyStore);
_keyStore.Load(null);