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

migration flag fix

Browse source
This commit is contained in:
Kyle Spearrin 2019-06-01 00:42:26 -04:00
parent 638de90cc4
commit 50f71e7280
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@ namespace Bit.App.Migration
public static bool NeedsMigration() public static bool NeedsMigration()
{ {
return ServiceContainer.Resolve<SettingsShim>("settingsShim") return ServiceContainer.Resolve<SettingsShim>("settingsShim")
.GetValueOrDefault(Constants.OldLastActivityKey, DateTime.MinValue) > DateTime.MinValue; .GetValueOrDefault(Constants.OldUserIdKey, DateTime.MinValue) > DateTime.MinValue;
} }
public static async Task<bool> PerformMigrationAsync() public static async Task<bool> PerformMigrationAsync()
@ -158,7 +158,7 @@ namespace Bit.App.Migration
await cryptoService.SetEncPrivateKeyAsync(oldEncPrivateKey); await cryptoService.SetEncPrivateKeyAsync(oldEncPrivateKey);
// Remove "needs migration" flag // Remove "needs migration" flag
settingsShim.Remove(Constants.OldLastActivityKey); settingsShim.Remove(Constants.OldUserIdKey);
return true; return true;
} }
} }

2
src/Core/Constants.cs
View file

@ -24,7 +24,7 @@
public static string ClearClipboardKey = "clearClipboard"; public static string ClearClipboardKey = "clearClipboard";
public static string LastClipboardValueKey = "lastClipboardValue"; public static string LastClipboardValueKey = "lastClipboardValue";
public static string LastBuildKey = "lastBuild"; public static string LastBuildKey = "lastBuild";
public static string OldLastActivityKey = "other:lastActivityDate"; public static string OldUserIdKey = "userId";
public const int SelectFileRequestCode = 42; public const int SelectFileRequestCode = 42;
public const int SelectFilePermissionRequestCode = 43; public const int SelectFilePermissionRequestCode = 43;
} }