mirror of
https://github.com/bitwarden/android.git
synced 2024-12-24 18:08:26 +03:00
sync when finished migrating
This commit is contained in:
parent
17b90c744c
commit
5eee358059
3 changed files with 6 additions and 1 deletions
|
@ -124,7 +124,6 @@ namespace Bit.App
|
|||
else if(message.Command == "migrated")
|
||||
{
|
||||
await Task.Delay(1000);
|
||||
SyncIfNeeded();
|
||||
await SetMainPageAsync();
|
||||
}
|
||||
});
|
||||
|
|
|
@ -40,6 +40,7 @@ namespace Bit.App.Migration
|
|||
var environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
|
||||
var passwordGenerationService = ServiceContainer.Resolve<IPasswordGenerationService>(
|
||||
"passwordGenerationService");
|
||||
var syncService = ServiceContainer.Resolve<ISyncService>("syncService");
|
||||
|
||||
Log("Migrating 2");
|
||||
// Get old data
|
||||
|
@ -189,6 +190,7 @@ namespace Bit.App.Migration
|
|||
settingsShim.Remove(Constants.OldUserIdKey);
|
||||
Migrating = false;
|
||||
messagingService.Send("migrated");
|
||||
var task = Task.Run(() => syncService.FullSyncAsync(true));
|
||||
Log("Migrating 11");
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -183,6 +183,10 @@ namespace Bit.App.Pages
|
|||
get => _wordSeparator;
|
||||
set
|
||||
{
|
||||
if(value == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
var val = value.Trim();
|
||||
if(SetProperty(ref _wordSeparator, val))
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue