mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-25 02:18:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

migration cleanup

Browse source
This commit is contained in:
Kyle Spearrin 2019-06-03 15:06:05 -04:00
parent 4055f92831
commit d620b70dac
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/App/Migration/MigrationHelpers.cs
View file

@ -25,7 +25,6 @@ namespace Bit.App.Migration
return false; return false;
} }
Log("Start migrating.");
Migrating = true; Migrating = true;
var settingsShim = ServiceContainer.Resolve<SettingsShim>("settingsShim"); var settingsShim = ServiceContainer.Resolve<SettingsShim>("settingsShim");
var oldSecureStorageService = ServiceContainer.Resolve<Abstractions.IOldSecureStorageService>( var oldSecureStorageService = ServiceContainer.Resolve<Abstractions.IOldSecureStorageService>(
@ -99,10 +98,10 @@ namespace Bit.App.Migration
settingsShim.GetValueOrDefault("push:currentToken", null)); settingsShim.GetValueOrDefault("push:currentToken", null));
await storageService.SaveAsync(Constants.PushRegisteredTokenKey, await storageService.SaveAsync(Constants.PushRegisteredTokenKey,
settingsShim.GetValueOrDefault("push:registeredToken", null)); settingsShim.GetValueOrDefault("push:registeredToken", null));
//Log("Migrating 6.9"); Log("Migrating 6.9");
// var lastReg = settingsShim.GetValueOrDefault("push:lastRegistrationDate", DateTime.MinValue); var lastReg = settingsShim.GetValueOrDefault("push:lastRegistrationDate", DateTime.MinValue);
//Log("Migrating 6.9.1 " + lastReg); Log("Migrating 6.9.1 = " + lastReg);
// await storageService.SaveAsync(Constants.PushLastRegistrationDateKey, lastReg); await storageService.SaveAsync(Constants.PushLastRegistrationDateKey, lastReg);
Log("Migrating 6.10"); Log("Migrating 6.10");
await storageService.SaveAsync("rememberedEmail", await storageService.SaveAsync("rememberedEmail",
settingsShim.GetValueOrDefault("other:lastLoginEmail", null)); settingsShim.GetValueOrDefault("other:lastLoginEmail", null));
@ -166,9 +165,9 @@ namespace Bit.App.Migration
if(oldFingerprint) if(oldFingerprint)
{ {
await storageService.SaveAsync(Constants.FingerprintUnlockKey, oldFingerprint); await storageService.SaveAsync(Constants.FingerprintUnlockKey, true);
} }
else if(!string.IsNullOrWhiteSpace(oldPin) && !oldFingerprint) else if(!string.IsNullOrWhiteSpace(oldPin))
{ {
var pinKey = await cryptoService.MakePinKeyAysnc(oldPin, oldEmail, oldKdf, oldKdfIterations); var pinKey = await cryptoService.MakePinKeyAysnc(oldPin, oldEmail, oldKdf, oldKdfIterations);
var pinProtectedKey = await cryptoService.EncryptAsync(oldKeyBytes, pinKey); var pinProtectedKey = await cryptoService.EncryptAsync(oldKeyBytes, pinKey);
@ -182,7 +181,6 @@ namespace Bit.App.Migration
Migrating = false; Migrating = false;
messagingService.Send("migrated"); messagingService.Send("migrated");
var task = Task.Run(() => syncService.FullSyncAsync(true)); var task = Task.Run(() => syncService.FullSyncAsync(true));
Log("Done migrating.");
return true; return true;
} }